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

Change-Id: Icd2687cd6f8f9b253ea06a375e5b963e71d200e5