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

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



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