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