Merge branch 'dev/13/fp3/qcom_telephony_stack' into int/13/fp3

* dev/13/fp3/qcom_telephony_stack:
  Revert "Move libmpbase dependency to where it is used"
  overlay-operators: Drop unsupported carrier configs
  Revert "operator-overlay: Drop injecting telephony jar"

Change-Id: I23202f13368382c81d1679b2a07f21328086e15d