Remove unnecessary if checks This is a cherrypick of commit 58fb7d617d8f6f504ecfb746ffcba7b1179e6eb6. Bug: 239926177 Test: atest mediaroutertest CtsMediaBetterTogetherTestCases Change-Id: I8478669747ca291d92b825e205f58add76e9a2a2 Merged-In: I8478669747ca291d92b825e205f58add76e9a2a2