Merge "Remove unused DumpstateOptions parcel" am: 73bc78fe43 am: 12199a2d2d
am: 84fbf305ff

Change-Id: I320150459d94537a702cf75626c7e114cc5875ed