Merge "Preserve attributes on rollback." am: b1e8640f7e

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

Change-Id: I46d6af12c92cdf470ade3c38eedfc7a52b1c0517