Merge "Move sepolicy and recovery from on-device tree and add dependency." am: 2d4d8842 am: d6aae57b am: bdfd4583 am: c8cf4d7d Change-Id: Ie2304a77d998e164a912a66630f32db6716dba44