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

Change-Id: I6562cbc8a78e29c4d61344b9edb1ffba6e45c722