Merge changes from topic "presubmit-am-67ba33c090484110ac10516a3ae9f95e" into sc-qpr1-dev am: f30cd26e76 am: 9b240318a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15901610 Change-Id: I4cfe5e63650b17bc797c9169d9bd360938d05e1c
This commit is contained in: