[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-bf225175796a4d8380340d50c15bb418" into tm-qpr-dev-plus-aosp am: ef6640ed -s ours

am skip reason: Merged-In Ie5c6e8dbc69001478af78923b02bcca7777ed6b1 with SHA-1 41472029 is already in history

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



Change-Id: I1b24e18cbeedb42ddb2cde3d13e4832be51c139a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>