ANDROID: GKI: enable CONFIG_TCP_CONG_BBR

Enable support for BBR (Bottleneck Bandwidth and RTT) TCP congestion
control algorithm, which maximizes network utilization under certain
scenarios. Note this still maintains CUBIC as the default algorithm.

Bug: 362198193
Bug: 368186339
Change-Id: I2885893e565f91d14cb2c139d975e4abfee80daf
Signed-off-by: wuwei1 <11150500@vivo.corp-partner.google.com>
Signed-off-by: Carlos Llamas <cmllamas@google.com>
(cherry picked from commit ee7395c4cb9b2e56e8f2dae5ac4a9f9cb9d78192)

arch/arm64/configs/gki_defconfig

diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
index 9cbf777..8a952ce 100644
--- a/arch/arm64/configs/gki_defconfig
+++ b/arch/arm64/configs/gki_defconfig
@@ -152,6 +152,11 @@
 CONFIG_INET_ESP=y
 CONFIG_INET_UDP_DIAG=y
 CONFIG_INET_DIAG_DESTROY=y
+CONFIG_TCP_CONG_ADVANCED=y
+# CONFIG_TCP_CONG_BIC is not set
+# CONFIG_TCP_CONG_WESTWOOD is not set
+# CONFIG_TCP_CONG_HTCP is not set
+CONFIG_TCP_CONG_BBR=y
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_IPV6_ROUTE_INFO=y
 CONFIG_IPV6_OPTIMISTIC_DAD=y

arch/x86/configs/gki_defconfig

diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
index 4103fd0..623836c 100644
--- a/arch/x86/configs/gki_defconfig
+++ b/arch/x86/configs/gki_defconfig
@@ -143,6 +143,11 @@
 CONFIG_INET_ESP=y
 CONFIG_INET_UDP_DIAG=y
 CONFIG_INET_DIAG_DESTROY=y
+CONFIG_TCP_CONG_ADVANCED=y
+# CONFIG_TCP_CONG_BIC is not set
+# CONFIG_TCP_CONG_WESTWOOD is not set
+# CONFIG_TCP_CONG_HTCP is not set
+CONFIG_TCP_CONG_BBR=y
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_IPV6_ROUTE_INFO=y
 CONFIG_IPV6_OPTIMISTIC_DAD=y