[automerger skipped] Merge "DO NOT MERGE: Fix OsTest#test_xattr_Errno test on CTS" into oreo-mr1-cts-dev
am: 9d31f82f58  -s ours

Change-Id: I9d7ce6d4118d74beb280b33e1e7b306ccaa00118