Merge "getWifiActivityEnergyInfoAsync: throw NPE instead of IAE"