Merge changes from topic "presubmit-am-821d6efded8a499dbc4f84363a0f60f9" into...

Merge changes from topic "presubmit-am-821d6efded8a499dbc4f84363a0f60f9" into sc-dev-plus-aosp am: d5e77485 am: a41cc3da am: fa3fca43

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

Change-Id: I8eddbd6bf8f575c3f17801e815c5855710c8b4d2