Merge "Merge "Call clearCallingIdentity before notifyDnsResponse" am: e40bc740 am: 2d7dbf8e" into qt-dev-plus-aosp