Merge "Update Profile-aware user settings test instructions to show new location in settings." into stage-aosp-pi-cts-dev