Merge changes from topic "presubmit-am-239d2269b4fc4ca6ba645ea90c95b636" into sc-dev-plus-aosp am: 29362f1e81 am: cb83eaef2e

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

Change-Id: I7a7030f89a33c719e884b76b2d8ace839afeb312