Merge changes from topic "presubmit-am-61e6241521da4f04b2fb70ebbb6c35ae" into sc-qpr1-dev am: f16b6c83 am: 86c397d1

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

Change-Id: Ia10d4a8d8695e93834f3e667ffd79bc32d9920c8