Merge "Fix conference log history for work profiles." into udc-dev am:...

Merge "Fix conference log history for work profiles." into udc-dev am: f5548354 am: 3db47c55 am: c60ea5f4

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/22957517



Change-Id: Iea955d4167cc0086114a9270d73d3923eb6135e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>