Merge changes from topic "presubmit-am-6e2d2013d117441baf471cd8f74a86ef" into sc-qpr1-dev am: 33503d596a am: 3cd7152978
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16238718 Change-Id: Idbb3dc7d5421b75293fe579254459bf852b2125c
This commit is contained in: