Android S Beta 2 (SPB2.210513.007)
Merge "Fix the HAL uninitialized error message for setLocalPrefixes"