tree 04ffbe29574ac54d2970032f5c3ccee85839af52
parent 3f74e021dba7cfcca57450eddccdec6208a19bff
parent 272606503e4d3ffe657f920ff019927b7fbf8760
author Brad Ebinger <breadley@google.com> 1558720873 -0700
committer android-build-merger <android-build-merger@google.com> 1558720873 -0700

Merge "Mark DDS PhoneAccount as CAPABILITY_EMERGENCY_PREFERRED" into qt-dev
am: 272606503e

Change-Id: I66099cd90d4f75c6b7c14e4014fae2bb033509a2