frc_340819220 (11022343,com.google.android.captiveportallogin,com.google.android.configinfrastructure,com.google.android.scheduling)
Snap for 10118161 from a1d418cc919a6b92418146c66f027a8a34e3a6da to aml-frc-release

Change-Id: Ida160d4ab861d72e526aaf8ccf7c12c31076cd52