Merge "Flag the android.os.Build.VERSION_CODES#VANILLA_ICE_CREAM constant" into main am: 3b16630e52

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

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