[automerger skipped] Merge "Revert line introduced in previous CL that seems...

[automerger skipped] Merge "Revert line introduced in previous CL that seems to always pass `false` for `onTrustManagedChanged`" into main am: 07588c8f am: b8285591 am: 7ac53eb4 am: 7ec6e931 -s ours

am skip reason: Merged-In I2a4e3579d945a8c993b1a03eb27b05ceb4c4c792 with SHA-1 b772ef6e is already in history

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



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