[automerger skipped] Merge "FocusRequester: fix NPE" am: c7ed3e7e22 am: a1ee32071b
am: afed6fafe5 -s ours
am skip reason: change_id I88447a255132c94f8c2fbf97a1e3ee88f6d2e993 with SHA1 b1381b8fba is in history

Change-Id: I36ced2f40f2f88438310b2acaee60bb2c2241b04