[automerger skipped] Merge "Bound Telecom logging recursion" am: 63dc1d50 am: eb77c749 am: c87158d0 -s ours am: e0f6dc07 -s ours

am skip reason: Merged-In I52f44dd02d0d860d0894e9b84fded8cf5ff5a18e with SHA-1 bde5c375 is already in history

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

Change-Id: I7a727ec34f24dbdd23232d3ccdf4b4eb34c8ee4a