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

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

Change-Id: If59910e45f3dd5426ef77ace25920bef91ec4b7c
Signed-off-by: Automerger Merge Worker <[email protected]>