Merge "java FlagImpl: Clear context into Provider" into main am: b0c550dcb2

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

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