Merge changes from topic "presubmit-am-83614c0b76a14ebc87638664e51ddec9" into sc-qpr1-dev am: cdb0a1f48f am: d31f5de12c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16855951 Change-Id: Iac4b8b07ff55e711360161d07cb31ba8057a277b
This commit is contained in: