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

Change-Id: Ie663913c43aabeef2c2005f5439b326aa3c36017