[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-5e85a1ad75f141e799291ec6c22492f6" into sc-mainline-prod am: fcba30a7 -s ours am: 0314cfb6 -s ours am: 634db575 -s ours am: b46a6a13 -s ours

am skip reason: Merged-In Idf1ab60878d619ee30505d71e8afe31d8b0c0ebe with SHA-1 1325574d is already in history

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



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