[automerger skipped] Merge "[Mainline] Use isActiveSubscriptionId instead of isActiveSubId for mainline" am: 75b3666b02 am: 0a1d15530b -s ours am: f9803fc6c2 -s ours am: 4486da9ea9 -s ours

am skip reason: Change-Id If740c2d7ea2c1392d5fe538091ea6e5c4575ad26 with SHA-1 f4d2771526 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1392547

Change-Id: Iee0800365e6a9ca0ca27b0482baa5d8d220ca46c
This commit is contained in:
Bonian Chen
2020-08-06 16:53:03 +00:00
committed by Automerger Merge Worker

Diff Content Not Available