Merge changes from topic "presubmit-am-22095588cfca4cccb6de704ccd95f743" into sc-qpr1-dev am: 50f10204 am: cd01fbb0

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

Change-Id: I52cca76b9431d597827565f0377a4ccdec9bb33a