[automerger skipped] Merge "Move HAL constructors to RILUtils" am: 626939d4 am: 85d1a811 -s ours

am skip reason: Merged-In Ib91982eecad87d958cb0c72a49c916a3a5e05a9a with SHA-1 a47e2420 is already in history

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

Change-Id: Ib924921cc4db16d10b1fb38234b753ed1cc83641