Merge "SystemServer: add isWatch guard for Twilight & WiredAccessory"