[automerger skipped] Merge "Bound Telecom logging recursion" am: 63dc1d5081 am: eb77c749aa am: c87158d0b0 -s ours

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

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

Change-Id: Iee4b72839dbff9d096d317340b354a68b69dc315