[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 am: 8c26d537 am: cb613dcc am: efe9b0b2 -s ours
am skip reason: Change-Id I94346939cda910b01ffee75cf8b62a23ec5314cc with SHA-1 d6cc960f is in history
Change-Id: Ia2c93b96ed8b19d22bfdea8ba1befc11e0741c7e