Merge "DO NOT MERGE: Fix OsTest#test_xattr_Errno test on CTS" into oreo-cts-dev am: c2a74064 -s ours am: 66053313 Change-Id: I1bdbd54ff8ae0b668fe3da04a392a208a3165199