Merge "Add setEnableBrotli tests" am: c9cf281abe am: 8b72dde55b

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

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