Prefer property_contexts from /system & /vendor
am: ce0ca252f2

Change-Id: I9f58582b6408fb41889333f6ba0c575708d82199