Merge "Merge "Fix output switch will show empty slice" into rvc-dev am: 425f8d235f
am: 363cd6e7fa
am: 8dcfaf6aed" into rvc-qpr-dev-plus-aosp am: e8a45fce5a
Original change: undetermined Change-Id: I31d95578583ac00e4c3f876e2c16fba8e01c7779
This commit is contained in: