Merge "Removes the a11y service from the cached service list when...
Merge "Removes the a11y service from the cached service list when onPackageRemoved" into rvc-dev am: 179321d5 am: 8488205e am: d55aff90
Change-Id: I530476b182679b41d3f5fa1cd127dcafb54a468e