Merge changes from topic "presubmit-am-67ba33c090484110ac10516a3ae9f95e" into sc-qpr1-dev am: f30cd26e

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

Change-Id: I2bed3bb2f73c1f47147349aea6cb061b6a83844e