Merge "Support settings activity for accessibility shortcut target" into rvc-dev am: 6820d68e am: 218fb987 Change-Id: Ic0d1db944366e4b07645126ce047c296ba742753