Merge branch 'jb-k3.4' into jb-7.7

Conflicts:
	overlay/frameworks/base/core/res/res/values/config.xml

Change-Id: I8f8481827eec6369a20dc67ad712cd8e976fb659