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

Change-Id: I4805f81099cf87f3f8b2c6b95bd29aca4aa32df4