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

Change-Id: Ide9b4817aa7e997dfd6aee48d5ea92396f4e3430