[automerger skipped] Merge "Allow injection jar to be located in system_ext...

[automerger skipped] Merge "Allow injection jar to be located in system_ext folder" into rvc-qpr-dev am: 6df14b38 -s ours am: a2c88e9d -s ours

am skip reason: Change-Id I732cf3e91cc85053c139e6385c3b12c9796ae69e with SHA-1 f1778fc7 is in history

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

Change-Id: I5c75925a8dfb8627e373256c5b13bc73183bd982