Merge changes from topic "presubmit-am-d42aa9966d86454092249b55f0b30895" into sc-qpr1-dev am: 23bae112 am: 7736b153

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

Change-Id: Iba08b35ab86b7e887d4e5c634caf8ad28a31183a