Merge "Fix a11y service targeting sdk version doesn't update" into rvc-dev am: 6651da43 am: b9bd430d am: c9ba41b4 Change-Id: I212e36521f6aa1322a2dab2707238b6e625390bd