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

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

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