Merge "Allow injection jar to be located in system_ext folder" am: df99853b...

Merge "Allow injection jar to be located in system_ext folder" am: df99853b am: 5346a798 am: cba2d4d2 am: 314e8c9d

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

Change-Id: Id34add4c5653806b260f95b5dc43a92e2ecdbc29