[automerger skipped] Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into...

[automerger skipped] Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-mr1-dev am: b64534ce -s ours am: 4505eccb -s ours am: 3c352b62 am: 8e3b22b5 am: b29239f6 am: 5cd2a51d -s ours
am skip reason: subject contains skip directive

Change-Id: I79294ae6e351c1b6b9dcefabc5a8135a0a77bde6