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: I60164d0cf9854f8dac2562c816306d482b0cf956