tree 18f7f461b30b7ee9515e11037c474ed8c7721923
parent 62c556a33cbe0da38cf9f5b02a463b5a6300e27a
parent d3af1ced7b7faae4e26725ebbba68e755415e290
author Brad Ebinger <breadley@google.com> 1562968332 -0700
committer android-build-merger <android-build-merger@google.com> 1562968332 -0700

[automerger skipped] Merge "Mark DDS PhoneAccount as CAPABILITY_EMERGENCY_PREFERRED" am: 628cd1a629 -s ours
am: d3af1ced7b -s ours
am skip reason: change_id Ia01416069eeceb3a8e01b7e2aa0121b2ab43289c with SHA1 cde27691e3 is in history

Change-Id: I50c6b7530e5217ce677ad00c5bbdf6fc947798a5