Merge "Allow modernize-use-emplace warnings" am: bd37f6ff68 am: 604ea8edec am: 1dca501deb am: a8bf930790

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2221662

Change-Id: I8caa22b377ff6d3008f700d5b9cdcf057c5aa872
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/cmds/idmap2/Android.bp b/cmds/idmap2/Android.bp
index 6ef6845..aa2113f 100644
--- a/cmds/idmap2/Android.bp
+++ b/cmds/idmap2/Android.bp
@@ -41,6 +41,7 @@
         "-modernize-return-braced-init-list",
         "-modernize-use-default-member-init",
         "-modernize-use-equals-default",
+        "-modernize-use-emplace",
         "-modernize-use-nodiscard",
         "-modernize-use-override",
         "-modernize-use-trailing-return-type",