[automerger skipped] NetworkScoreManager: Expose SCORE_FILTER_* consts am: 16fc91a1c1 am: 51564c0050 am: 9cfa347e01 -s ours
am skip reason: Change-Id I9eab2e84d0b00fada7629a104566c1099f8b1288 with SHA-1 bc81782bb1 is in history

Change-Id: Ibe5cf9f54c3c1b0fe1f7e072fde20ad0318ab1f9