Merge "Unable to select twilight scheduling after enabling location" into rvc-dev am: a5e7d180f1
am: 09312d8e70
am: 6add1fb28b
am: baa7c500a3
Change-Id: I9301a63a9b91344ce80a3c6b7dc60c958081f64b
This commit is contained in: