Merge "Add PREUPLOAD.cfg AOSP check"
am: d9d3f853d5

Change-Id: I86f40085e80c0a87e47bfd3f02208510fb6b130d