Merge "[automerger skipped] Merge "Disable RatRatcheter feature for rats not...
Merge "[automerger skipped] Merge "Disable RatRatcheter feature for rats not in the same rat family" into rvc-dev am: 703b426b -s ours am: a516c2df -s ours" into rvc-d1-dev-plus-aosp