Merge "Clear caller id when reading device config" am: d0fe0c721d am: 08b5ccae7d

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

Change-Id: Ifc338b34e2271063c077f15335113efc2dacedfb