Make ForeignAPI and ForeignDB GadgetRepos use different cache keys

Change-Id: I5326753ff2c78c7b2515dfc59e95341a8b702280
Merge "Make ForeignAPI and ForeignDB GadgetRepos use different cache keys" into RL2