[automerger skipped] Merge changes from topic "presubmit-am-1ab3ffc180ef400a970f85dbe14238c7-sc-dev" into sc-mainline-prod am: 2bc324b5 -s ours

am skip reason: Merged-In I7707d01be37582461227edcecf5d559f2019c8a5 with SHA-1 b029b005 is already in history

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

Change-Id: Ie5f565d69f7703ca29582adea0e0c737016132ce