Merge changes from topic "presubmit-am-ba475b17246b4ba3be601f794b9dc05b" into sc-qpr1-dev am: 9e5fe6862f am: 2486a26525
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16155272 Change-Id: I29bbf470ce270373fce4cb72bfb5ff6f1ed1eafe
This commit is contained in: