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 am: 18c15c04

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

Change-Id: I856517924d0a767b63ea6127b7d4e39e09e93f2c