Merge "VTS: Reduce TV's advertising set requirement to 10" into udc-dev am: 1b3c5410

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/23202864



Change-Id: Id1415017c4488405751758f1f1d654bf84a2ee98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>