Merge "Add crash recovery logic to HardwarePropertiesManagerService" into oc-mr1-dev
am: 2c25615224

Change-Id: I251edb32e216129d6cb1a1ad2b29f22505cb420a