Fix a ConcurrentModificationException in ObjectValue overlays#3062

wu-hui merged 3 commits intofirebase:masterfirebase/firebase-android-sdk:masterfrom

kmsbernard:synchronized-overlay-mapkmsbernard/firebase-android-sdk:synchronized-overlay-mapCopy head branch name to clipboard