Merge "Wireless emergency message has to be run in pin app mode" into tm-dev...

Merge "Wireless emergency message has to be run in pin app mode" into tm-dev am: d353a5c5 am: e1ccd793 am: 5126d4e4

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



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