am: c2cc8044 -s ours * commit 'c2cc8044': DO NOT MERGE Fix intent filter priorities Change-Id: I60eb783f06f0eb0c09c21ea6ec0fc10340ff63c6