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

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

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

Change-Id: I753c0d8e3e3bc8948c85bc92f1642d0de595c49b