Fix part of #3616: Migrate all non-test Android API deprecated references to the replacement versions with proper gating logic

Fix part of #3616: Migrate all non-test Android API deprecated references to the replacement versions with proper gating logic #8758