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

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

Change-Id: I9ebbf73a0c6f407770f2c3a1577b7f88b7ce8b1b