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

Change-Id: I17134b41b19dda484375128ff3f26c12bdadcb64