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

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

Change-Id: Iea3f1916e2034ff0ecaa8e7fd210f96dee250318