Merge "Update rollback reason in logging." into main am: 79e82a8e20 am: cc75a2376c

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

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