Refactor code to allow B&R logging

logging will follow in later cls

Test: NotificationManagerServiceTest
Test: backup and restore with flag on
Bug: 289524803
Flag: android.app.backup_restore_logging
Change-Id: Ic5afc37d498fc0335a0782a70d4fb474b91201e9