Merge "Skip register NetworkManagementEventObserver on V+ devices" into main am: 3ded04f409 am: 5667c95bab

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

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