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