Merge "Add MATCH_ANY_USER flag to PackageInfo queries" am: eda29f73aa am: 8f03d96e83

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

Change-Id: I44318046f675749fe056fa253da3d48c88129441