Merge changes from topic "bug_298263955_proxy_warning" into main am: ad2da357f8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3023864

Change-Id: I51fa78d30b1afd87aea45a5c45bde50976e70dc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>