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

Change-Id: Ie08634e7e68d71ef409215d2cbf48be6a2a740ca