Merge "Catch exception when checking WifiDisplay availability" am: 7a08901d1b
am: 6d5e7bf41f

Change-Id: I8e1453bdd39ce220381a3368846bb137c4878dd4