[automerger skipped] Merge "Move android_*_stubs_current modules to frameworks/base" am: 1bc6c36e3e am: 553f2741b7 am: ad21b9d9ab -s ours
am skip reason: Change-Id I407d0d939582841ffa651488bf76667ab7ce9c64 with SHA-1 f371ec46ec is in history

Change-Id: I934e22b1102a8660bf6156cfc609602922eed164