Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-dev am: 0f41dc420f am: 5f1d7675ea

Change-Id: I197f9d12435267964c84bfcee18c371611fa728c