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: Id38b078b0834c91c8d9bd54156d66df1d3a9973f