Merge "Fix PackageManagerPerfTest with permission cache" into main am: b504c6c16a am: 89a6151a0a

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

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