Merge changes from topic "presubmit-am-35fae4ebf09746dab6952e8f4d152668" into sc-qpr1-dev am: 8d220a98c2 am: a2d77332e5 am: 199a1ab67a

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

Change-Id: Ic27f592a30402cc1442866f2cf019805ed26b810