Merge "Support settings activity for accessibility shortcut target" into rvc-dev am: 6820d68e25

Change-Id: I0dec303c9db9058e8f879f5cd6764ab1c3f8d5d0