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

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

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