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

Change-Id: I19f2cf2c161d5ec0afb7131c882ac1d822a0b6ba