Merge "Always trigger safe mode callbacks" into sc-qpr1-dev am: 24ad5af4f5

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

Change-Id: Ieed9c2e04e586ddc73d66ef260d8b4a3a1d97bfa