Merge "Updated settings for new get/set feature change" into sc-dev am: 5487f2fa6c am: a5ba299ab7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14202131 Change-Id: I2a662e654c5fd0e922ac6a41b9bf0f7f691d9d86
This commit is contained in: