Merge changes from topic "presubmit-am-e3c1888c62794717b02f19ce77d046a6" into sc-qpr1-dev am: 0dc764cba5 am: 4d58f2df3d

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

Change-Id: Icd14c31be7f422eb126041475513ed4537181eda