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

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

Change-Id: I129441b67ebc611cdc226deb3e7e982a14dad551