Merge "Merge "Revert "Unable to select twilight scheduling after enabling location"" into rvc-dev am: 6d2ad68e1a
am: ada7e82b72" into rvc-d1-dev-plus-aosp am: 53b24cdc38
Change-Id: Ic3b485551ce8804c7efe24f7f5ea1eb9b671f60c
This commit is contained in: