Merge "Support dumping mainline relevant service pre-boot into bugreport" am: f2a15e8742

Change-Id: I3b3e33b12498021957306ce6715bb713d26ef82d