[automerger skipped] Merge "Expose BIP and VSIM relavent definitions" am: 55a22edbab am: f73b66fadf am: 224f95e57d -s ours

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

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

Change-Id: I82342526cd5d9983d0459b4da014dc8e9bda9482
tree: ba7319d0fd4b2b3283f4b3fb39159ac9be3d38ee
  1. framework/
  2. service/
  3. services/
  4. test/
  5. tests/
  6. OWNERS
  7. TEST_MAPPING