[automerger skipped] Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-mr1-dev am: b64534ceb2 -s ours
am skip reason: subject contains skip directive

Change-Id: I46e62bd45f14b79772dbb584167a01bef66b314b