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

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

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

Change-Id: Ie4c76dab8bc247ece6d793051aa5f2ee96ae210a