Merge "Restrict Emergency Assist API to system image only." into nyc-dev
am: d4c5828697

* commit 'd4c5828697e918d75171a9b95e72df664e3a8c67':
  Restrict Emergency Assist API to system image only.