[automerger skipped] Added resource overlay flag to enable/disable...

[automerger skipped] Added resource overlay flag to enable/disable getSubscriptionUserHandle am: 60892c9e am: 443d146a am: 2c20a57f -s ours

am skip reason: Merged-In I69e43883b913e29effa50847268a34fc01f88de4 with SHA-1 f29c8926 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2499716



Change-Id: Ia1f4f1b1c76410d8c227baf00a389f14f8f57ea7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>