[automerger skipped] Merge changes from topic "hiddenapi-cherrypick" am: b5679cdace
am: 3065d671a9  -s ours

Change-Id: Ib0f04ac96cdbdb384d93120aa7d5d13fb90a77cc