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

Change-Id: If29d8258aac6453462e1d35f31ceaf3f4d42aab7