Merge "[automerger skipped] adbd is not available for platform am: f29a03d87d -s ours am: 6aa34cbb18 -s ours" into rvc-d1-dev-plus-aosp