Merge "Fix several challenge paths" into sc-dev am: fcb325c562
am: 1a10e00c54
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14342148 Change-Id: I544ec89f2b6e0340685d407420b707cde8a14e87
This commit is contained in: