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