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

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

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