Merge "Do not start conntrack event monitor when running on R" am: c162fc297f am: de2d7bef3b am: cde05e5133
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1639703 Change-Id: Iecbed59bf7dcc249b288164e43d5357eff3f94f2
This commit is contained in: