[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-7ba48eb6ba70402ba7633198b5ee3795" into tm-qpr-dev-plus-aosp am: 38967a6f -s ours

am skip reason: Merged-In I8c8c59ad0e3f19880ec543686285a89b0b864739 with SHA-1 42e1f4f5 is already in history

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



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