Merge changes from topic "presubmit-am-1d243c5f55224d3684bfc31d9ac4ff50" into tm-mainline-prod am: 131be1ce

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

Change-Id: I7f6994d95dfff78738475c62f21358c647b95c8d