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

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

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