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

Change-Id: I7a98fa39acee962cf209fa64abdac9a708497d98