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

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

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