Update FocusFinder am: 713af5fdd3 am: 74f91531c8 am: 30f2b4afad

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11825630

Change-Id: Ic96f3bdcc2178fdcc2477c17f59db6fe3bf5eb73