[automerger skipped] Merge "Improve logging for why a staged session was reverted" am: 55103afd78 am: afb34c51c2 am: 8fd3ac3d37 am: 53ee58bdc8 -s ours

am skip reason: Change-Id I5cd1733d66aa0b30855803b95eb9818dc81aa0d7 with SHA-1 a4cb493bdb is in history

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

Change-Id: I2ebc71e02ba58b76e105b2b1f7a31b45cedec084