Merge "Add setEnableBrotli tests" am: c9cf281abe

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

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