Merge changes from topic "presubmit-am-7600ce26d35c4e57aac5d98a83d07b5c" into sc-qpr1-dev am: 36706694 am: 2e6fe629 am: 8e45845f

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

Change-Id: I2d687e1c47af367196eae2096cfc1e1f647404b3