Merge changes from topic "presubmit-am-14ff594d3ab040c7bb757733d1814dd9" into...

Merge changes from topic "presubmit-am-14ff594d3ab040c7bb757733d1814dd9" into tm-mainline-prod am: 39b73286

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



Change-Id: I8a869eba03d02dc6591f8977ee215b2762589d57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>