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

Change-Id: I9129290d77f1ed2934d49ed86a286952df18a6d2