[automerger skipped] Merge "Always trigger safe mode callbacks" into...

[automerger skipped] Merge "Always trigger safe mode callbacks" into sc-qpr1-dev am: 24ad5af4 am: ada726e2 am: c53cfc40 -s ours

am skip reason: Merged-In I856517924d0a767b63ea6127b7d4e39e09e93f2c with SHA-1 7cf35e7b is already in history

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

Change-Id: If9b2b7071a2d21f5410aa00f4a616a18f0d17a4d