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

Change-Id: Iaf08110d17515bca7522b04a43a7ef4795552e85