Merge "Revert "Cts tests for Settings intents"" into lmp-mr1-dev