Merge "Support dumping mainline relevant service pre-boot into bugreport" am: f2a15e8742 am: 593d730ecf am: 27fddb2035

Change-Id: Ibaacf312d20371b249350e84e700607523ae8e41