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

Change-Id: I8c0b0b4b1221addb932cb6c79482ea2a07ea253e