Merge "Expose ACTION_EMERGENCY_ASSISTANCE as SystemAPi" am: ba4eb1d6b4 am: 68a76f5c4c

Change-Id: I3953180c29faba0bcc14c4c3f6a56a7455ec3a47