[automerger skipped] Clean up staged session data on validation failure am:...

[automerger skipped] Clean up staged session data on validation failure am: 58432ac6 -s ours am: eac7e1ee am: ef924c05 -s ours am: f3e1ce74 -s ours am: 0a78f111 -s ours

am skip reason: Change-Id Idd6597cd0d2dda34a8a7626b585401eeee39c31f with SHA-1 f5441218 is in history

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

Change-Id: I320bc8746c00870e995e7e7198a74749d33334ed