Merge changes from topic "presubmit-am-1b5cf7c12da84505927afb0314fbb5cf" into sc-qpr1-dev am: d3f7702814
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15902752 Change-Id: Ib32a4a5c7b0d23c8933ffcaad0c9eb5873957bfb
This commit is contained in: