Merge "Make sure to udpate enterprise id" am: 724e9d6a7f am: 0cd153c240 am: 9f28d7cf30

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

Change-Id: Ia3b355f327cc7a2251f76ded4d54dea767a698fe