Merge "DO NOT MERGE: android.hardware.graphics.allocator@2.0 is no longer VNDK-SP"