Merge "restorecon hwservice_contexts." into oc-dev am: f8952a196c
am: 30ec708335

Change-Id: I3689132a9536852a6458c282041aad04d1d77059