Merge "Don't let non-touchable windows retain a11y focus" into pi-dev
am: 8bbc30955a

Change-Id: Ia611497edd3721ea3ff88cf93087c45894b18656