Merge "Clear data from failed commits and recommits properly." into rvc-dev am: fc424b9a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11859962

Change-Id: I88daaf99b12a72da4a1048396c6c820bb6d1d367