Merge upstream tag 'v1.47.2' into aosp/main

Bug: 395959309
Test: Built and booted Cuttlefish with ext4
Change-Id: I8ca1cee48a49ee8ce05125e20f438712239f1182