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

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

Change-Id: I20b00b6d751deda4914269540a209c45d033ff7d