[automerger skipped] Merge changes from topic "bug_298263955_proxy_warning"...

[automerger skipped] Merge changes from topic "bug_298263955_proxy_warning" into main am: ad2da357 am: 2bbd55c4 -s ours

am skip reason: Merged-In I3c959a7dd62ee57415c22a8034d774fe49a8f64f with SHA-1 0b60166c is already in history

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



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