Merge changes from topic "presubmit-am-8fce4e975b58476c9f42996d277b3173" into sc-qpr1-dev am: 9b4d98a546 am: ea114bc8cd am: c7865a3637
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15643967 Change-Id: Idb20677e1110539a438266e49841b73c0d3f79f6
This commit is contained in: