Merge "Make sure to udpate enterprise id" am: 724e9d6a7f

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

Change-Id: I197e3ffcb876739c724942915c08a323565c7a35