Merge changes from topic "dtim_aidl" am: 6255cc03cc am: 230f165219

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/2422520

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