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

Change-Id: I01afa68e3cea31b7fe868d14fb612718cdf2a257