Merge "Update non-framework emergency location request notification" into qt-dev
am: d566984298

Change-Id: I55729ac8b04bfff48189838d1cb6f7bf9bec9731