Merge "Always trigger safe mode callbacks" am: 831f78825b am: 24e038e8a4

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

Change-Id: Iab1d2875aac2acc7a2e67045d1c2cd07aa4112ef