Merge "Merge "freezer: thaw on dumpsys data collection" into rvc-dev am:...

Merge "Merge "freezer: thaw on dumpsys data collection" into rvc-dev am: e12741e8 am: 48298afd" into rvc-d1-dev-plus-aosp am: b973831e am: 80f0de1d

Change-Id: I1bb22951f195bf8e8d6a830c5961a305c1ff81d0