[automerger skipped] Added SubscriptionDatabaseManager am: 69a68a43 am:...

[automerger skipped] Added SubscriptionDatabaseManager am: 69a68a43 am: 8f91778c am: 00bf17a7 -s ours am: a33d7e89 -s ours

am skip reason: Merged-In I2845352f89d71c303ea2d1503fb3d15dcf7730b2 with SHA-1 7b55c1ad is already in history

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



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