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>