Merge "LocalDisplayAdapter test for stale DesiredDisplayConfigSpecs"