Merge "Add DumpstateOptions java implementation" am: 52502ef1a1
am: 8a9f23c8a1

Change-Id: I392c2c6bdb522efa708b82174debf3a18167c0bc