[automerger skipped] Merge changes from topic "am-af9507788a8b4331adddceb5131a255e" into tm-dev am: f848370f -s ours

am skip reason: Merged-In I7585a0a5eeb308e0e32a4f77f581556d883b5cda with SHA-1 21e48cf2 is already in history

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

Change-Id: Ie2988cea12463ff2ad81b98cc7ba7a2bcf6bfe69