tree 90e375e2c425d3ba96904ffce92775727f50a7ac
parent 29a17a4c6e44805aa572cfa4ee0da8ca66235462
parent 230f1652198e90dfd26beebad6b61a3911fefc39
author Xiao Ma <xiaom@google.com> 1680086291 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1680086291 +0000

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>