[automerger skipped] Merge "Rollback info API change. Added impact level to RollbackInfo." into main am: 88bcbfceae am: ef540d4f6e -s ours

am skip reason: Merged-In I723405eb62577202893ff208af2ab01b212b112a with SHA-1 c88f5b1f47 is already in history

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

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