Merge "[Output switcher] Delete strongly recommended test as suggested" into stage-aosp-tm-ts-dev