Merge "installd: only delete contents of user's CE and DE dirs" am: 6f73923f86 am: bece848769 am: 16897382cc

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

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