Merge "Remove unused DumpstateOptions parcel"
am: 73bc78fe43

Change-Id: I43c6252c88fa954e9be08bff4989e04737570e2c