Merge "Provide color override path through keyguard preview renderer" into udc-dev