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

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

Change-Id: Ibf21aee94536a27b5954cb9ffed4e304dc4a27c6