[automerger skipped] Merge changes from topic "hiddenapi-cherrypick" am: 4972754f23
am: 3a5adcdcaf  -s ours

Change-Id: I82b104f5cefe643d3af2f5b37aaa2377e2245a90