Merge changes from topic "presubmit-am-bbf213f141924072ae886cc03356ffb5" into sc-qpr1-dev am: f6d5da7d28

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

Change-Id: I29c3ce4b6bf69f19f536c4a9dff578d61e11a0be