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

Change-Id: I54f6fc3aa5a3dde94a0c4b31561facd4775a1960