[automerger skipped] Merge "Delay instantiation of PacProcessor until unlocked" into sc-v2-dev am: f0f45d194d -s ours am: 2d1a5f17dc -s ours
am skip reason: Merged-In Id42d857289a0b0f7df5b1c48f94d1b363d94235e with SHA-1 3f0400e221 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16055808
Change-Id: I3973d46a1513f665ae5ec01d0c5b70015a5e22fd
This commit is contained in: