Merge "releasetools: Add NonAbOtaPropertyFiles for non-A/B OTA packages." into pi-dev
am: 246f9e8c2b  -s ours

Change-Id: I4bda9f5c7c3c91509cb424a516f816d5545bc0e3