[automerger skipped] Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-dev am: 0f41dc420f am: 5f1d7675ea am: ad56194783 -s ours
am skip reason: subject contains skip directive

Change-Id: I5b7670226082f60abc45ae023e687a8b0191f20e