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 am: d9645027
Change-Id: I358230aecbf53337e001b64b97f0c791c60aeac9