[automerger skipped] FileMap::create: remove duplicate addition. am:...

[automerger skipped] FileMap::create: remove duplicate addition. am: 54794ac6 am: 2912d9c1 am: 98e21320 am: a6d71508 am: 8a192ea1 am: 3c751b9f am: 5281bee3 am: e0e6fc87 -s ours

am skip reason: Change-Id I73a3a4e75f0aad00888e8f2b49a07b7e8b4eda05 with SHA-1 54794ac6 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12393457

Change-Id: Ia4686bed24465b49c8405095c1467e9f22d77afd