[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: 7ef79b7b -s ours

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

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

Change-Id: I001c92b36bbf15b47ec62fa740e24e2e0741714b