* changes:
  Merge changes from topic "am-37e67136d540486a893fc3d0a4f9aaa6" into android12L-tests-dev am: dd6d5f55
  [automerger skipped] Merge "Codec2 VTS: Move device resource files to data/local/tmp" into android10-tests-dev am: e788c2bc -s ours am: 92191ec9 -s ours am: ed16d5e0 -s ours am: 902bfac9 -s ours