Merge "CallDiagnosticService API" am: c90335033b am: 9882ff4bf8

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If7de00877b77e4594c05eb6e4fd2ff8f0318bad5