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

Change-Id: Id30f7bbedc082a41d29992ec996301c3342cc22c