Merge "Add DumpstateOptions java implementation"
am: 52502ef1a1

Change-Id: I18d5d73028a5ebfdf0ac13d141e20cc5356b61e1