tree 3fd636785f0cb9f4e6a1684887126fe3361c7020
parent d5e882db02fc2f527585b5b1b7f88ad8f4105d5d
parent 814a8e4d90a930cfbe60d116e00e2cbf5f70cbef
author Bill Yi <byi@google.com> 1631452946 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1631452946 +0000

Merge changes from topic "presubmit-am-647350e3bf134d7da0e8df1bfb2dc418" into sc-qpr1-dev am: 814a8e4d90

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

Change-Id: Ia3919ae1e66f94ee8a3fe37853a49ad328577d7d