Merge changes from topic "presubmit-am-972dcb5456b14246b20e89e741cf7eaa" into sc-qpr1-dev am: 8b9ef48f4b am: 92d60b46f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15748028 Change-Id: I73507b7f0274cc067a9ff0c54e230ce2294b949e
This commit is contained in: