Merge changes from topic "presubmit-am-e4978075937f4e43aa46e37caf0dc425" into sc-qpr1-dev am: 9a1f59b4

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

Change-Id: Ib42516f168fc720e753d13288d7953eded8d773b