watchprops would go to 100% CPU after processing first change

original Id: I7992dcb9926f323367899fbdbdec15ab4e5872a4

picked from
https://android-review.googlesource.com/#/c/14700/

Change-Id: I3425118c417887d9717da880ee481c220320f796