[automerger skipped] [conflict] Merge changes from topic "presubmit-am-1ab3ffc180ef400a970f85dbe14238c7-sc-dev" into sc-qpr1-dev am: 3994ced9 am: bb38b85c -s ours

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

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

Change-Id: Ie178a64e48039c4725cd4ad927482b035210a3a5