Merge "The net cap value should be bit shifted before &ing" am: 43dd35b6fc am: b266811ecf

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

Change-Id: Ib611f1895bc9856adc489a4e5808f5f89d865b16