Merge "Fix jank when loading emergency info." into oc-dr1-dev
am: ce2c089ef9

Change-Id: I0a0659027d491a99ba2ed22fa36e74fd92a80f55
tree: ce293022dc13b1ab171e7baf747f15e899f0b99c
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags