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

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

Change-Id: Ib4e58028230daba525dd685f5e796165d39b6060