[automerger skipped] Merge "Change the Theme of the ECBM AlertDialog"
am: d5d252e096  -s ours

Change-Id: Icae21b56a757b63c769398fa3c5a57f6a19aa5d0