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

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

Change-Id: Ic67abac14c3356c68c8a5752552b2f6f09acadf9