Merge "Merge "Add newlyUnlocked to onTrustChanged" into tm-qpr-dev am:...

Merge "Merge "Add newlyUnlocked to onTrustChanged" into tm-qpr-dev am: 752ed0bf" into tm-qpr-dev-plus-aosp am: 3eef1545

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



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