[automerger skipped] Merge "[VCN19] Rename get/setSubIds to get/setSubscriptionIds" am: 19a855be79 am: eb452d7330 am: f62a74d65d -s ours

am skip reason: skip tag Change-Id I9d90df5fc13b36d2cdc4920b456dcc87fcd2b3a7 with SHA-1 9605391498 is already in history

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

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