Merge "Catch exception when checking WifiDisplay availability" am: 7a08901d1b
am: 6d5e7bf41f
am: 7d72837179
Change-Id: Icd680a4790dfbf694ae15f044ab6ffab02435727
This commit is contained in: