Merge "Fix a11y service targeting sdk version doesn't update" into rvc-dev am: 6651da43 am: 3f38df7f Change-Id: Id5acc1cbd83ae5b4d1e0229b9a993829b33c2073