Merge "Add clarifying comment on enableAddServiceCache" into main GitOrigin-RevId: f9a71079fb7fb614907b8a034a0a3b8d36d12bba Change-Id: I5f6a39fce4be964dbd4c472ff712ea1027648bae