Merge changes from topic "presubmit-am-ef6979eb0d794319a4c16a36a338836c" into sc-qpr1-dev am: b448864515 am: bd95253f03 am: b0d395001d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16853496 Change-Id: I75886a0a004fd055690773d2e908db97d7f1aa35
This commit is contained in: