Merge "Fix location settings status" into sc-dev am: 68432aac29

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/15261512

Change-Id: I690c7bb2be9820192be2c40604226727c615eacd