Merge "Fix a11y service targeting sdk version doesn't update" into rvc-dev am: 6651da4348

Change-Id: I8ff3da0582ade2f564b829f9d6583c9e12ec2ab0