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

Change-Id: I075bed129afac3b85a756f77874787568e4ecece