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

Change-Id: Ia8121d9b66575b5f9766e806ad54bfd777519c04