Merge "Revert line introduced in previous CL that seems to always pass `false` for `onTrustManagedChanged`" into main am: 07588c8f9d am: b828559150 am: 7ac53eb45e

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

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