am c9bf387c: am bff51540: am 32655b2c: am 20df4f87: Merge "Ensuring launcher is always setting "interactionBegin/End" where appropriate (issue 11030735)" into jb-ub-now-indigo-rose

* commit 'c9bf387c1f5bf65d1d624451feea7c9889181487':