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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8b40794b7cb0fbd874e2a76403d275cb388e6ac9