Merge "Remove puncture_fs." am: c88c5f166e am: db50240400

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2460622

Change-Id: I21b8a203e0bdd373e3c845946ab95507fb3dfa69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>