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

Change-Id: Ie3dfd7444eaf62ccb2d08af6b4db84ca6931cd94