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

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

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

Change-Id: I7f7011b557e1bbac3c8e6e96c3577a84605c2733