[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-3fb47bd9042c40f2b731af5a9978b6b9" into sc-mainline-prod am: cb1451fb -s ours am: c41f7141 -s ours

am skip reason: Merged-In Id5e94d44ac9ab24870a8213ec7583da0f592a5ff with SHA-1 2100d275 is already in history

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



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