Merge "Revert line introduced in previous CL that seems to always pass `false`...

Merge "Revert line introduced in previous CL that seems to always pass `false` for `onTrustManagedChanged`" into udc-qpr-dev am: 97c0b19d am: cf27af81

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



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