Merge "Remove obsolete comment about Weaver deadlock" into main am: 9d44241b am: aafaa51e

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



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