Merge "Unable to select twilight scheduling after enabling location" into rvc-dev am: a5e7d180f1
am: 09312d8e70
am: 6f85a575aa
am: 6555edd9ee
Change-Id: I673d0d9386f55fa0b90cee563aa420e508422feb
This commit is contained in: