[automerger skipped] Merge "Support decoding the new PREF64 RA option." into...
[automerger skipped] Merge "Support decoding the new PREF64 RA option." into rvc-dev am: 109ee272 -s ours am: 98aafc40 -s ours
am skip reason: Change-Id I94346939cda910b01ffee75cf8b62a23ec5314cc with SHA-1 d6cc960f is in history
Change-Id: Icbaf843cf7448284f714a55a93c9a98e70c58b25