Merge "Add telecom log marking shell command." am: 5b04c63c64 am: b984978ad7 am: 5f44a37baa

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

Change-Id: I8b7c0ed95bb77dd0761eebafa2deb645ec728163
Signed-off-by: Automerger Merge Worker <[email protected]>