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

Change-Id: I3d56dd44f024313554a6204f2dd44f9abcdda06b