Merge changes from topic "presubmit-am-35fae4ebf09746dab6952e8f4d152668" into sc-qpr1-dev am: 8d220a98 am: a2d77332

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

Change-Id: Iae9a7bbe33f80e6a41e45cc3d3ba47731c937eaf