Merge "Update logging after adding string field to RescuePartyResetReported atom" into main am: 311d8cfc am: 83ca5ade

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



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