[automerger skipped] Merge changes from topic "presubmit-am-5e85a1ad75f141e799291ec6c22492f6" into tm-dev am: fb7e1bbcef -s ours am: cf401fe05c -s ours am: 574b77d761 -s ours

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

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

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