Merge "Add dumpsys and extra logging to FoldableDeviceStateProvider" into main