Merge "Fix CompatUtil on Q and R" am: b2e6d5baf8 am: fe3d837f96

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6b398ccb036e5db7903328c0156e5ed2cfd19273