[automerger skipped] Merge "Update BaseBundle to not use LazyValues when using...

[automerger skipped] Merge "Update BaseBundle to not use LazyValues when using ReadWriteHelper" into tm-dev am: 91e0c359 am: cfd63875 -s ours

am skip reason: Merged-In I8a878a6d0055b04b2611909b4b17977ba5677a4f with SHA-1 a0d9fc3b is already in history

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



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