Merge "Allow TelephonyManager#testListen to timeout" into nyc-dev