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