Merge "Update registerNetworkScoreCache() to accept a filter type." am: a511a07fa3 am: 4150ec18e9 am: 9f38345a08
am: 5364e2b82b  -s ours

Change-Id: Ic0aca7bcbbfdeec984e22d6809796f1d9384b141