[automerger skipped] Merge changes from topic "hiddenapi-cherrypick" am: b54f2acc72
am: e88607ed9d  -s ours

Change-Id: Id2cac1fb483bb68996fad2f834ae9cf063003870