Merge "Support settings activity for accessibility shortcut target" into rvc-dev am: 6820d68e am: d89ae0f5 Change-Id: Ic1d37d5566880c012fe0a28a12339d39a2bc4c23