[automerger skipped] Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into...

[automerger skipped] Merge "RESTRICT AUTOMERGE Make toasts non-clickable" into oc-dev am: 0f41dc42 am: 5f1d7675 am: ad561947 -s ours am: 929b23ac -s ours am: d98efda2 am: 06267090

Change-Id: I80d933328f24433bf7f0b5087feaa25072f4b99a