Merge "installd: only delete contents of user's CE and DE dirs" am: 6f73923f am: bece8487

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2078473



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