Merge "Remove ro.expect.recovery_id"
am: c683233b64

Change-Id: Ibabb8d69adf943370cb39b284e7704f3f8e22f2a