Merge "Fix enterprise resources ID typos" into tm-dev am: b46f5219 am: 082c0381

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



Change-Id: Ia8560a4bf4a6dec9d4edd64dacc09e51baf786ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>