Merge changes from topic "presubmit-am-af15b7fb137442c3a62a25c0a6389cfa" into sc-qpr1-dev am: a94df207

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

Change-Id: I2c7cf975dec66acc756cf9bb6db6767061b51691