Merge changes from topic "hiddenapi-without-fb" am: 0a311460 am: 832a2584 am: 326f8972

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaea9954c4c1f195940470ea5f0822efd5f1b13f5