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

Change-Id: Ic957fd6de672f9f5ce90296dc8634c53f267ce54