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

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

Change-Id: I9bee5b04f3a633f44b65b2c311f91216bb5d9436