Merge changes from topic "presubmit-am-d5aeba84add64a9a9dd59331ecf1ff06" into sc-qpr1-dev am: effda99679 am: e7b1ea37f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16793875 Change-Id: I935464692345563fe04004e4b9bf52a0f7e848f8
This commit is contained in: