Merge "Add a lock for call read/write operations to avoid ConcurrentModificationException." into sc-qpr1-dev am: 6ba0239947

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

Change-Id: I461106440aca625975ff5cac0e60d1c597dc74fb