Merge "[VCN04.1] Add assert tool for Set" am: ecb948964f am: ba307f5275 am: e90ce5ef72

Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1623673

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I65127f882520cf3cdba82ad2a28835b3a2f9404b