[automerger skipped] Merge changes from topic "inc-hard-am" am: 314863c1 am: 18e538f7 am: 513b4cf0 -s ours

am skip reason: Change-Id Icb295186b85e1edcdcebc1d746f7ff0d6ef66829 with SHA-1 016f9e65 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0fd9e8cbdfd62c1d63dab5a013e6e61859a9a573