Update FocusFinder am: 713af5fdd3 am: 74f91531c8

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

Change-Id: I82c7e5dd78281e2c49f31063c3979845cef9831b