am 556d35db: Merge "Revert "Cts tests for Settings intents"" into lmp-mr1-dev

* commit '556d35db4a47458f0527978fda6538564d86a958':
  Revert "Cts tests for Settings intents"