Merge "GuidedStepFragment: fix replacing actions when subActions expanded" into nyc-support-25.1-dev
am: cbbfe18e22

Change-Id: I7ea9fd54c3c0539685b3fca8a215fde4aaa185f0