Merge "Allow For Separate Work Settings App In CTS-V" into oreo-cts-dev