tree b2c74f32872f95e17e2ed465b97581fbfa490ca6
parent 5e8ec67b3e42ed0904f0df3bb2fd61a18a896d6a
parent 68a76f5c4c2c269fc3130ee1d7b8222840a8cd9d
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1576273621 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1576273621 +0000

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

Change-Id: I3953180c29faba0bcc14c4c3f6a56a7455ec3a47