[automerger skipped] Revert "DO NOT MERGE: Revert "Add VanillaIceCream to...

[automerger skipped] Revert "DO NOT MERGE: Revert "Add VanillaIceCream to android.os.Build"" am: 067dd3e1 am: 652c19eb -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22797865



Change-Id: I5ef2e11fd57ef9588676142c9c2bfcc4ca3fb51a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>