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

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



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