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 am: 712c38b5 -s ours am: 43b51e32 -s ours

am skip reason: Change-Id I2ec69257839676f7f50e3fa77af8c565130329be with SHA-1 f0f8bc02 is in history

Change-Id: I8715900afbff81ce85348734a7761dfd12dd7837