Merge "Merge "DO NOT MERGE: Skip touch focus change on virtual displays for vr" into oreo-cts-dev am: 169450596d  -s ours" into oreo-mr1-cts-dev