Merge "Move dumpstate to calling getprop." am: 16401044cb
am: 599dc3588a

Change-Id: Ic71ec9f048e3d47ed9be4b12903d5de172edae18