Merge list

These repos have merge errors:

art
bionic
bootable/recovery
build
build/kati
dalvik
external/boringssl
external/e2fsprogs
external/f2fs-tools
external/fsck_msdos
external/gmock
external/google
external/libnetfilter_conntrack
external/libnfc-nci
external/libnfnetlink
external/libselinux
external/mksh
external/nano
external/stlport
external/tinyalsa
external/toybox
external/wpa_supplicant_8
external/zlib
frameworks/av
frameworks/base
frameworks/native
frameworks/opt/net/ims
frameworks/opt/net/wifi
frameworks/opt/telephony
hardware/libhardware
hardware/libhardware_legacy
hardware/qcom/bootctrl
hardware/qcom/bt
hardware/qcom/display
hardware/qcom/media
hardware/qcom/wlan
hardware/ril
libcore
packages/apps/Bluetooth
packages/apps/CarrierConfig
packages/apps/CellBroadcastReceiver
packages/apps/ContactsCommon
packages/apps/Dialer
packages/apps/FMRadio
packages/apps/Nfc
packages/apps/PhoneCommon
packages/apps/Settings
packages/apps/Stk
packages/providers/ContactsProvider
packages/providers/TelephonyProvider
packages/services/Telecomm
packages/services/Telephony
prebuilts/tools
system/bt
system/core
system/extras
system/media
system/netd
system/sepolicy
system/vold