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

Change-Id: I4ff5f1b208a246e0d750f3f4871096463ea1db74