[automerger skipped] Merge "Add SystemApi for captive portal metrics" am: 4369ea8416 am: b4eab23249
am:1911c3fac5-s ours am skip reason: change_id I4bccfbd87bae5b2d65e45c7a5918aa45ab5d76e8 with SHA1d66669edc9is in history Change-Id: I033bf8791cfbd1ee4036cc156b91d7e5ce0775d6
This commit is contained in: