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: Ic09a5a945eec5ff65aac5f89436226d7f2bf69c5
tree: 3817e349eddbea8fdcc4a7464b3e91a5dea91f93
  1. staticlibs/