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

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

Change-Id: Id93a381ffe58cdb61dfe40bbf3898bd8165dcfba