Merge changes from topic "presubmit-am-3e6ab1dc1c14473f852ccb484c65ce15" into...

Merge changes from topic "presubmit-am-3e6ab1dc1c14473f852ccb484c65ce15" into sc-qpr1-dev am: b3fb2731 am: 53cb67e6 am: 7b2ea795

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

Change-Id: I3bbc08a3a384c1e1aa1174c0914087e74e3bf6a7