[automerger skipped] Merge changes from topic "b/167709539" am: ad688d3e8c am: 7d360a08a0 am: df594989e6 -s ours

am skip reason: Change-Id Ifb61fe596c1a8fab1bd536ec904285e532629b71 with SHA-1 5d414d1075 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I80fc74b342a0ede6aada83be633c826c4a899bc8