[automerger skipped] Merge changes from topic "am-53a9f1d72dd747f68e6524ac203eb8cd" into tm-dev am: 0581af17 -s ours

am skip reason: Merged-In I3da105951af90007bf48dc6cf00aed3e28778b36 with SHA-1 75bd0edd is already in history

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

Change-Id: Ie882cf648e66e4a30d064aae8b496572eec448c3