Merge "[automerger skipped] Merge "Add SystemApi for captive portal metrics" am: 55849979a5 am: 56bed1321e am: df46cd451f -s ours am skip reason: change_id I4bccfbd87bae5b2d65e45c7a5918aa45ab5d76e8 with SHA1 d4a9de2055 is in history"