Merge "Merge "Clean up toStatsDimensionsValueParcel" into rvc-dev am: f5550861 am: bb88d64c" into rvc-d1-dev-plus-aosp