Merge "Always trigger safe mode callbacks" am: 831f7882 am: 24e038e8 am:...

Merge "Always trigger safe mode callbacks" am: 831f7882 am: 24e038e8 am: a03a566b am: ce693654

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

Change-Id: I7f92cc2b136bda7543738621298d5783c5a364cf