[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 am: 5cd2a51da7 -s ours
am skip reason: subject contains skip directive

Change-Id: I79294ae6e351c1b6b9dcefabc5a8135a0a77bde6