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

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

Change-Id: I0f62958c27de0e3b87b57012a75cc38c2a3ae692