Merge "Allow focus from mouse click" into arc-apps
am: 551a2a1d6e

Change-Id: I98238347d483d37150c96f0a14f750144460b785