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

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

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