Merge "PhoneWindowManager: Changes for WiFi Display to comply with Android CDD"