Merge changes from topic "presubmit-am-fc6c1726f93647c58c127ec66f619246" into sc-qpr1-dev am: 1eb40704b4 am: 0fa398fab5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16103736 Change-Id: I8285f6709fa5008224860c45ac4b96b5fa4ea568
This commit is contained in: