Merge "Mark ab/6881855 as merged" into stage-aosp-master am: 46914e4d25

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

Change-Id: I1bb9cb5c093220ef5c7e04db73c763b65ef96c4c