Merge "added usage of dumpstateService to bugreportwear option" am: 361f2e0366 am: 55d7a1cbdf
am: 5f96cb6159

Change-Id: Ie3f614d7ca408d37ecec0858f498f56c50a689fb