Merge "Add default/android.hardware.dumpstate@1.1-service.example" am: a2d07ec5d2

Change-Id: Ic6539e45ac66ad358d85f7a47e5392b56b0443b7