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

Change-Id: I1aced2b87be4b443593625fc763003cb9ce93893