Merge changes from topic "VPN_ICON" into main am: 782c1fd11e

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

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