Merge "Update attention mgmt test for channels & sorting" into oc-dev
am: fa30068a31

Change-Id: I5cf170c40f2b887f3a4889c7f3ee6976a745170a