Merge "Move RecoverySystemService into its own package" am: 9164399321
am: 53bb6db434

Change-Id: Id4d147684fbad83a10f730ec1464688c2b912986