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
am: 1786c6c6e6
Change-Id: I905bc4f957f26520ff602a451cd204af50c737dd
This commit is contained in: