Merge "Merge "Revert "Merge "Remove ability to downgrade importance of...
Merge "Merge "Revert "Merge "Remove ability to downgrade importance of existing channel." into oc-dr1-dev"" into oc-mr1-dev am: a6b8e450" into oc-mr1-dev-plus-aosp
am: 3697def2
Change-Id: I934d3681051d16a989278ba40316eb2f1ee23472