[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 skip reason: subject contains skip directive

Change-Id: I53d35a4d2f2c517ec50cfdbc22008bda2e4041c5