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

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

Change-Id: I15d5d68b7236b8e5221ea0b0db8415f217d7363d