[automerger skipped] Stage OEM_PAID and OEM_PRIVATE ApnTypes am: 5bb65847 am: a2fa54aa -s ours

am skip reason: Merged-In I8d7b4b5c10c4caec923592597ae1709b6e277a7a with SHA-1 44607f3b is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3312331



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