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

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

Change-Id: I23bc303e7c273ae087a2f089f94889f4eab95054