Merge "MAP 1.4 : Enable map adv notification" into q-keystone-qcom-dev