Merge "Skip register NetworkManagementEventObserver on V+ devices" into main am: 3ded04f409 am: 1d5dab9082

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

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