Merge "Set safe mode alarm when validation reports NOT_VALID" am: 19be41cb30 am: 5bf42637a8

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

Change-Id: I9d806e017e873b72f5b37ab9f5371651ca360696