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

Change-Id: I2cee1961bb3014f8bfec7ccaede96a62d158c2c3