[automerger skipped] Merge "Make sure to use LOCAL_MIN_SDK_VERSION when needed" into stage-aosp-master
am: 7d02828caa -s ours
am skip reason: change_id I3883c56394bf9b2b47e97518b57af2d1cb79cb79 with SHA1 b0ace01fa4 is in history

Change-Id: Id24c03a402d619e24a9f5af06a733f5fbd698711