Merge changes from topic "presubmit-am-943e284c245b476c8b9d52d96160aedb" into sc-qpr1-dev am: 28dbc918b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15936311 Change-Id: I80c8c8bb7fd5fd376e9330cf7f5db4e69cc66e35
This commit is contained in: