Merge "Remove /data/apex/hashtree directory" into main am: 1de1f1d83b am: f581beabbd

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3374869

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