Merge "Links WPP clocks flag to SysUI's flag (3/3)." into tm-qpr-dev