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

Change-Id: I220a887ba9ac2da60791ce0fb695713e408ff29a