Merge "Fix CTS flakes caused by creating duplicated inputconsumer"