Merge "Grant rild and gatekeeperd access to hwservicemanager" am: 7d98edfb am: 6ea577a5 am: 7e3e9ffb am: c554b82a Change-Id: I592f25ea58e9da9b69df7b6d62cd4c356b086517