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