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
Change-Id: I2af4bf8799bc09611617f4edc114009452f8eda9
This commit is contained in: