Merge "Clear data from failed commits and recommits properly." into rvc-dev am: fc424b9a am: 240f6cad am: 819e9e4f am: 7f1fc8e2

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

Change-Id: Ie79198875163f0d9f1107f625610fa52a57b560f