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

[automerger skipped] Added resource overlay flag to enable/disable getSubscriptionUserHandle am: c4dae711 am: 75682e14 am: 967c6586 -s ours am: c6850f50 -s ours

am skip reason: Merged-In I1666b4e15d62b24462f0e1b88e963b5f074929bf with SHA-1 62fb3c97 is already in history

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



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