Merge changes from topic "presubmit-am-9775583256df468cab6420b6719fce49" into sc-qpr1-dev am: 761f529f3a am: 1e62abbbf4 am: 10be10a02c

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

Change-Id: I1112fffbd4d792239c8a3989b4192bc3288d40dc