Merge "Expose ACTION_EMERGENCY_ASSISTANCE as SystemAPi"
am: ba4eb1d6b4

Change-Id: Ia9f9fddc19c711e3df4c9ffc89b40508d26b7e32