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

Merge changes from topic "presubmit-am-c51d411780a442509d815a97aaea56e8" into sc-dev am: 639cb3b9 am: cadc28b2

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

Change-Id: I654cbfbf53c2e06a9d03e6da04c46ee51c6eba17