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

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

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