Merge changes from topic "presubmit-am-35fae4ebf09746dab6952e8f4d152668" into sc-qpr1-dev am: 8d220a98c2 am: 8dbb44e8f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15903068 Change-Id: Ife59afb9bf39ffdd737cfdd2277434276fcf4737
This commit is contained in: