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

Change-Id: I5341a7ab21758d1a47b0618cd8b1779f063b1406