Merge "[conflict] Merge "Add util to check device test-key build" into android14-tests-dev am: bea7f876a8" into main