am eabf77ca: am a14cb230: (-s ours) Merge "Guard against monkey actor test NPE inside FocusHelper b/19626762" into ub-launcher3-almonte

* commit 'eabf77ca9621393a0a32e16e7640888de08f1ea9':
  Guard against monkey actor test NPE inside FocusHelper b/19626762