[automerger skipped] Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into pi-dev am: 4b6e07283c -s ours am: 2b4b2c3d5a am: 512268ba7b

Change-Id: I129c434e45648047df954e6ef9d2c291f8d2817d