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

Change-Id: If3cc2ab4b43561a9fe671c297858511ea3d0f16f