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

am skip reason: skipped by user samiul

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

Change-Id: I1c2d29c0e71bf7b69a676fe8308ba746574f3a2c