[automerger skipped] Merge "Expose BIP and VSIM relavent definitions" am: 5e6693605c am: 30129ac6cd am: 15d9affab4 -s ours

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

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

Change-Id: I82342526cd5d9983d0459b4da014dc8e9bda9482
tree: a21c6566694fb37f80fd55902135139dbeab75bf
  1. framework/
  2. service/
  3. test/
  4. OWNERS
  5. TEST_MAPPING