[automerger skipped] Merge "DO NOT MERGE Add support for EFF/RTR to...
[automerger skipped] Merge "DO NOT MERGE Add support for EFF/RTR to canhalsend" into rvc-dev am: 42418738 am: a395e73e -s ours
am skip reason: Change-Id I330b9d24c34918b38612ddc1745f019e11bfd474 with SHA-1 62bbf3dc is in history
Change-Id: Ic6c8bd18b97d651671738e360342daa3553d3551