[automerger skipped] [DO NOT MERGE] Fix the ECBM dialog is not shown issue am: 701ff2ece9 -s ours

am skip reason: subject contains skip directive

Change-Id: I6cdd60b68248b430c9277e1f83a14f7b34123f62