[automerger skipped] Merge "Update API doc for accidentally exposed...

[automerger skipped] Merge "Update API doc for accidentally exposed NETWORK_TYPE_BITMASK_LTE_CA" into tm-dev am: 91604b8e am: 04ea1d46 -s ours am: eec0f488 -s ours

am skip reason: Merged-In Id0c521c4fb74eaf7d73deaf122e923f72b924c18 with SHA-1 882677a1 is already in history

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



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