Merge "hiddenapi: Refactor before new features are added"
am: d9e590d6c9

Change-Id: I564c26b947721f4b6aee1cdb0acee1e5f5182adb