Merge "RIL instrumentation" into tm-qpr-dev am: 0548085c am: bd787a58

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



Change-Id: I8590a4b1517557999f2170680cc821c0bfc51411
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>