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

Change-Id: I0282749b861a6571326c725b5c62a0ebda99dff9