[automerger skipped] Merge "Expose BIP and VSIM relavent definitions" am:...

[automerger skipped] Merge "Expose BIP and VSIM relavent definitions" am: ef743129 am: 112185f2 am: f4c048af -s ours

am skip reason: skip tag Change-Id I41e881c6fe39e92d5cdac2d0a02fa8a8e814c9c5 with SHA-1 13989ac6 is already in history

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

Change-Id: I82342526cd5d9983d0459b4da014dc8e9bda9482