[automerger skipped] Merge "Store override DB file path as...

[automerger skipped] Merge "Store override DB file path as ParcelFileDescriptor not FileInputStream" am: ac4baf8c am: 100cfe14 am: 28397104 am: 8d82d394 -s ours

am skip reason: Change-Id Iae4343275d41f80be8975c01c02b1a6c2927aa02 with SHA-1 26b3e0e6 is in history

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

Change-Id: I2c4960ce6e6b1642eb50fa06eed3fccfe205a48f