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