Merge changes from topic "presubmit-am-fc6c1726f93647c58c127ec66f619246" into...

Merge changes from topic "presubmit-am-fc6c1726f93647c58c127ec66f619246" into sc-qpr1-dev am: 1eb40704 am: 595d3168

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16103736

Change-Id: I348924b78ee6584e17e885d7b0807b976e275f83