Merge "Use Q permission on Q for startCaptivePortalApp" am: efcc79f2a5

Change-Id: I7985ae613e89e7376555c3ba3d53d075ffc71596