Merge "Merge "DO NOT MERGE: Fix OsTest#test_xattr_Errno test on CTS" into oreo-cts-dev am: c2a74064b9  -s ours"