Merge "Fix broken settings intent CTS test" into udc-dev