[automerger skipped] Merge changes from topic "presubmit-am-b344c51c0b2b40219ea014db7d70478f" into sc-mainline-prod am: 4172cdb60c -s ours am: 2c992344fd -s ours am: 5348129b2d -s ours am: a7a28f3780 -s ours am: 610127e938 -s ours am: ba6efe5115 -s ours

am skip reason: Merged-In I3f59df865dc2dd13d4b9ac54bb2dacb7b23f0aa1 with SHA-1 6888543d3a is already in history

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

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