[automerger skipped] Pull latest geonames data 2021-07-29 am: 692645964a am: b570d6b359 am: e92f2a60fb am: 4a4609fc6d am: dacf5dbe05 -s ours

am skip reason: Merged-In I64af9c83260f81a2d58c0932a2751dd53cfad59f with SHA-1 0659e8c71b is already in history

Original change: https://android-review.googlesource.com/c/platform/external/geonames/+/1864557

Change-Id: If8e88082889b64a84c5e1351f8e72591bc440907