[automerger skipped] Merge "[DO NOT MERGE] Emergency button text should use...

[automerger skipped] Merge "[DO NOT MERGE] Emergency button text should use sp, not dp" into tm-qpr-dev am: ff86174b am: ea0d817d -s ours

am skip reason: subject contains skip directive

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



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