Merge "Merge "Revert "Unable to select twilight scheduling after enabling location"" into rvc-dev am: 6d2ad68e1a am: bfa9b3e6dc" into rvc-d1-dev-plus-aosp am: aa7682468b am: 21f78fbf9f am: 88533538af
Change-Id: I12e0e910a831b9e320a4cb1feba92aeef4864794
This commit is contained in: