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

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

Change-Id: I172f34e4e8e6f7bc38cef4006304cb017307afea