[automerger skipped] Merge "Make RecoverySystemService more testable" am: 49af39e751 am: 1b506101de
am: 93ea22120c -s ours
am skip reason: change_id If75632b8dc16c916f3fa90853d6c1863b75d2c64 with SHA1 96690bc4c9 is in history

Change-Id: I507086f25c5bb6ba8d805ef05a4e814de92e5c95