Merge "Stop enforcing the AOSP preupload hook"
am: 24a1d3db12

Change-Id: Ia5a00e1c3af39fd38c5133f9303aa3fa43ad51ce