Merge "GATT: Ignore NULL intent to start GATT Service during user switch." into p-keystone-qcom