Tuna's assets are starting to "muffin top"

ytf not put everyone's asses on one of them hip hollywood diets?

Change-Id: I6e1befd65620cbd429c1dbd0612249b6d374aaa8
move def_lockscreen_targets and def_lockscreen_targets_no_telephony to frameworks/base/packages/SettingsProvider

Vanir's previous defaults are reflected in our frameworks/base's version of this overlay

Change-Id: I888f24cdce187b9b285c6efc47a59829051686fd

Conflicts:

	overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
Move overlays to device tree

Change-Id: Ie02ed60e28732a75c4e6b5d5c05fbd142cf5f796
Merge "Move overlays to device tree" into kk44
Merge remote-tracking branch 'upstream/kk44' into kk44