Merge "[RescuePartyTest] Mocking CrashRecoveryProperties" into main am: 90bf3a9ef0 am: a8b3eacebc

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

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