[automerger skipped] Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into pi-dev am: 4b6e07283c -s ours
am skip reason: subject contains skip directive

Change-Id: I5e7c7ba4ba9d7c460a1e73e9e5b0feb01b5ae31d