Merge changes from topic "presubmit-am-9b95e1db2c474672a9f1a4c7c43d99d0" into sc-qpr1-dev am: 87b6e36de1 am: 2027b87d54
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15640453 Change-Id: I9ec3126412c6456fead0064901189ce7be024723
This commit is contained in: