Merge "Add 2 cts tests for FocusFinder" into stage-aosp-rvc-ts-dev