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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I66208320469f02fb0edda70dd17bd7e7d62deecd