Merge "Correct support status note for Pixel 2 and Xperia XA2 devices"