Merge changes from topic "presubmit-am-2143ecd1458f4508bf53aff3786dc505" into sc-qpr1-dev am: 85547878b9 am: f852501c30 am: 11140f27b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16357797 Change-Id: I60ad1ab04df5906527d8f17ca257f309b34ae867
This commit is contained in: