Merge changes from topic "presubmit-am-bc6dc398754a48ff9df19cdb0af17ffc" into sc-qpr1-dev am: bc965906 am: bfde3eca am: b1ffc75e

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

Change-Id: I53acd32dcae404f219795444e185042606d4c55b