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