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

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

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