[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 -s ours am: 090f5362 -s ours

am skip reason: Merged-In Id0c521c4fb74eaf7d73deaf122e923f72b924c18 with SHA-1 6b7f9df1 is already in history

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



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