Merge "Rename dumpstate service to include '.example'." am: b25a7316a5 am: c0f9a7935b am: 2deb6000a6 am: a2848d2ac7
am: f0e4514715

Change-Id: Ic6490b26056a9c6f15d0f96b280dc01535103a0a