Merge changes from topic "presubmit-am-239d2269b4fc4ca6ba645ea90c95b636" into sc-mainline-prod am: 3c6dc301

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

Change-Id: If77968f37ba5e163389e6175a10b4a69474a34c3