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

Change-Id: Ifd81dd5b158ae26f3dd608f088a1070d2753b20e