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

Change-Id: Ia263bc63065b686eec529b04036bcd89df0135e4