Merge changes from topic "presubmit-am-b2e291a416ff4d26ae9b9ac0b0a7cf6e" into sc-dev-plus-aosp am: 5dd1e5d1 am: aa517675

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

Change-Id: Ie1a4575a1dacbb53d9826e689a5e946b55962174