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