Merge "Merge "Non-deselectable routes can be deselected" into rvc-dev am:...
Merge "Merge "Non-deselectable routes can be deselected" into rvc-dev am: 49217faf am: 642f7582" into rvc-d1-dev-plus-aosp am: f544256d
Change-Id: I98315a05ca7ed2e644bcfebc2ad04aacfdf04a66