Merge changes from topic "presubmit-am-b07c53c40c7a488890bf5c1d4084ea9d" into sc-qpr1-dev am: a8ab77e46e am: 743a8a9389 am: 23abf07b61

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

Change-Id: I9b4a9755fa9628162909b4b48f59c11eb87b955b