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

Change-Id: I3f9e6e5d2ebb9284fd105bbb1f24600ee575bc7d