Merge "Merge "Call clearCallingIdentity before notifyDnsResponse" am: e40bc740 am: 2d7dbf8e" into qt-dev-plus-aosp am: 55f9b6ea Change-Id: I2b1dfae776ecd4f5d68c1a8c5a63b3fa12230729