Merge changes from topic "presubmit-am-89eae4c44d22430cafb16bdf4e262a4d" into sc-qpr1-dev am: da45fb7b

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

Change-Id: I4e17efbb03884b36f8be242ec793098be8e588f6