Merge "Lock ComponentResolver when taking snapshot" into tm-dev am: 715b58c2...

Merge "Lock ComponentResolver when taking snapshot" into tm-dev am: 715b58c2 am: 7d9c24b3 am: 2b6f0b6d

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



Change-Id: Ifb44d6b448ab9c8f5f1062082e93f1ddb2f47620
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>