[automerger skipped] Merge "Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged" into stage-aosp-master am: da0032b745 -s ours am: 089dc51162 -s ours am: b7fa314afb -s ours

am skip reason: Change-Id I4ed607532816d1f3f9075368f55017b97251ade8 with SHA-1 d57f303b46 is in history

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

Change-Id: I1f5aa80450d5849107570f32f44c13edda1957b2