Merge "Expose BIP and VSIM relavent definitions" am: 5e6693605c am: 30129ac6cd

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

Change-Id: Ibab74f3bcf6c804a31be54d4b7183ea75a6e172e
tree: 8eb02bdd047f72cce23a13b38f668f4f4f18d1c1
  1. framework/
  2. service/
  3. OWNERS
  4. TEST_MAPPING