Merge changes from topic "presubmit-am-7600ce26d35c4e57aac5d98a83d07b5c" into...

Merge changes from topic "presubmit-am-7600ce26d35c4e57aac5d98a83d07b5c" into sc-qpr1-dev am: 36706694 am: 2b75efe5 am: b8416104

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

Change-Id: I848c81757ce80a6634c2002be90404101480818a