Merge "Add the "enable emsg" flag" into rvc-dev am: 73113a6997 am: 31a63169a5

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

Change-Id: Ie75dd5e698be0e4b6b3af179c0975855ce228f4d