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

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

Change-Id: I392480eb3e54bddc96fde0f48eab009dbaef6538