Merge "defconfig: sdm845: Enable Service Locator/Notifier" into msm-4.9