Merge changes I211f4996,I3b3d18d0

* changes:
  Merge of AOSP I3b3d18d0: Test for Settings Intents
  Test for Settings Intents