Merge changes from topic "presubmit-am-eaa97beb2f6a4393b8a652f43ac1a987" into sc-qpr1-dev am: ff364396 am: 6af1ae9c

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

Change-Id: I7cbdc3f6997ad9f277036d80d93119d026b7679a