Merge changes from topic "cr-sysprop-fixed" into main

* changes:
  Mocking CrashRecoveryProperties in test
  Revert^2 "[CrashRecovery] Refactor SystemProperties as api"