Merge "add mExtendedProperties to PresenceScanFilterTest.java" into tm-mainline-prod