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

Change-Id: I8a1aa5d4e9af698735bf6ab9b4b6cd1bd1920f7f