Merge "Revert "Revert "Add message number constants matching DeleteUser and Del...""" am: 082af01885 am: cf754cbbe6 am: 508fe84b25 am: ef308d0a0b

Original change: https://android-review.googlesource.com/c/platform/system/gatekeeper/+/1847167

Change-Id: I8ec6ee1c83769f317acc2b7cdf8e798edcc0010f