Merge "GuidedStepFragment: Fix ResourceNotFound crash before v21" into nyc-support-24.1-dev
am: 3899c18684

Change-Id: I6a713e7a5796e7e171efc4aa00def74794004362