Merge changes from topic "presubmit-am-3e6ab1dc1c14473f852ccb484c65ce15" into sc-qpr1-dev am: b3fb273162
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15902916 Change-Id: Ie23abe31057411c92be0758041bfea8c1351d723
This commit is contained in: