Merge "Remove androidx dependency from WM CTS"