Merge "Fix focus at ttt chip" into tm-qpr-dev am: cd471248 am: 1fcdd542

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



Change-Id: If7028d75858a3a86dc16c407e9626af21f0d1031
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>