Merge "Fix test dependencies for AppEnumerationInternalTests" am: b0c1ec7c72 am: 2767f69016 am: 39dbf7a815 am: b08dd8279d am: 0e6836f576

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2161997

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