Merge "Merge "Support settings activity for accessibility shortcut target" into rvc-dev am: 6820d68e am: 218fb987" into rvc-d1-dev-plus-aosp