[automerger skipped] Merge "Include NOTICE file in /product partition." am: aa2ec5f239  -s ours am: 1e56e69a46  -s ours
am: 1237373743  -s ours

Change-Id: I00878455de5f09b6ab95d03ae5def411c8c0cb9e