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

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

Change-Id: I31660fef5e49fe49364d265289aa1633898f85a9