[automerger skipped] Merge changes from topic "12933478" into pi-dev am: a15664c01f -s ours am: df71b0f3a5 -s ours

am skip reason: Change-Id If3b420067b4d7111dcf67ae6f98e42176158b679 with SHA-1 dd41b25a83 is in history

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

Change-Id: Iccfdfc3b84fd4264c357af6931e137195678a704