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

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

Change-Id: Ibffd29b2b3ebcf6683278cac9f33ec2d1543941b