Merge "Fix deadlock in ComponentAliasResolver" into tm-dev am: 4e97fd8938
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17663452 Change-Id: Ice03332a899728474aa8bfa36cf561fc2e9ba143 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: