Merge "Expose BIP and VSIM relavent definitions" am: ef74312993 am: 112185f2fa

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

Change-Id: Ibab74f3bcf6c804a31be54d4b7183ea75a6e172e