DO NOT MERGE: Revert "Add VanillaIceCream to android.os.Build"

Revert V changes in U branches. V changes are needed to help
resolve merge conflicts as this topic lands in downstream
branches.

Bug: 275409981
Test: N/A

This reverts commit c7ffdf8bd63cb79faab7802363b97ce2792b1ea5.

Change-Id: I9422db9c0d980468b7f4678fe06866d06c8c7c31
2 files changed