Merge "Use a TreeMap for PL patterns so that they are sorted and hashed properly." into main am: d0913b5bdb am: 46e37f4a95

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

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