Merge changes from topic "presubmit-am-5e074e05e4c74163b4f9a025baec3cd0" into tm-mainline-prod am: 88dd6126

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

Change-Id: I4d81c77ada29ccd105330ec5578ede72f8910ef9