[automerger skipped] Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-dev am: 0f41dc420f am: 5f1d7675ea am: ad56194783 -s ours am: 929b23ac43 -s ours am: d98efda2ba am: 0626709062
am: 04a579c98b

Change-Id: I6317753c44c82c1d4cf749b239ca696e65b86602