Merge "system_properties: Fix FnMut/FnOnce type mismatch" into android12L-gsi