[automerger skipped] Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-mr1-dev am: b64534ceb2 -s ours am: 4505eccb39 -s ours am: 3c352b62af am: 8e3b22b5d7
am: b29239f66f

Change-Id: Ie10de3f5c8e5da9a0b937df38e68145fba29ab82