[automerger skipped] Merge "Update BaseBundle to not use LazyValues when using ReadWriteHelper" into tm-dev am: 91e0c35911 am: 5cf625d6b5 am: 386981be47 am: 7892568878 -s ours

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

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

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