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

Change-Id: Ib2445edfbe5bf03e8c3e293e59be1cd48300e60d