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

Change-Id: I0b4b6a26b538d6f51780413376d70b6906877893