[automerger skipped] Package core-current-stubs-for-system-modules into the SDK am: 18b3f5f895 am: 951644b92b -s ours

am skip reason: Change-Id I9d67344f159f9482567323f27c5a8e4e060e1f1a with SHA-1 89c5517a28 is in history

Change-Id: Iab7411dade21e83d186ca1de6dd8ff037055d305