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

Change-Id: I426208a605e3771238bd91c135e47faf1b559e58