Merge changes from topic "b-303511250-cleanup" into main

* changes:
  Use A11yManagerService to check if the A11yService warning is required.
  Minor refactoring to replace duplicated logic with existing methods.