Merge "Bound Telecom logging recursion" am: 63dc1d5081 am: eb77c749aa

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1691210

Change-Id: Ic2986e3767f3c6e24aa695a99f95d5b812400751