Merge changes from topic "hiddenapi-without-fb" am: 0a31146013 am: 832a258431

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1580531

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I034c118d8eb0aa64a0168b39f74d60abfe2ed0d1