Merge "Remove puncture_fs." am: c88c5f166e

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

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