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

Change-Id: I4d40f208d81bc4bf48f6808bee0d164aef4be206