Merge "Preserve attributes on rollback." am: b1e8640f7e am: 70da2fc349 am: cd3e8c60ca am: e935f37d7b

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1927454

Change-Id: I1dd83b8ac9c43ebaeda32261aaa466dc5995c113