Merge "Improve "Enabling rollback" log with rollbackId and originalSessionId" into main am: f99d2e86f9 am: 36dec1886a

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

Change-Id: If56d36ba53139695edf00ae5c238599dd2ba6eae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>