Merge changes from topic "inc-hard-am" am: 314863c132

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I58d9a1b68bc80e385c261ebc80b75b41a6fcd628