[automerger skipped] Clean up staged session data on validation failure am: 58432ac699 -s ours am: eac7e1eecc

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

Change-Id: I54b9824a53e1bff8ca9c3766b62c61f3cbfd4c97