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

Change-Id: Ibc43803c15d416292cb62f215330a874004dea2c