Merge "Only read the use_new_storage_value flag once per process." into main...

Merge "Only read the use_new_storage_value flag once per process." into main am: bdaf14f9 am: a5b26acd

Original change: https://android-review.googlesource.com/c/platform/build/+/3212787



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