[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 am: 3598f1ee7e -s ours

am skip reason: Merged-In Ibbb10392a283b88328ae17d9aa54322f50878e76 with SHA-1 2dd6a279b6 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/net/+/16842937

Change-Id: I53f96398bc3a66d617d78b534b1e909758f1f665