[2/2] Settings: ActiveDisplay (rework interface)

add option to choose notification layout
fix build

Change-Id: Ib2f644e3b6186efe34149ebc0904d571aac6bedc

Patchset: 4
https://gerrit.omnirom.org/#/c/5199/
Build V44
[2/2] Settings: ActiveDisplay (rework interface)

add option to choose notification layout
fix build

Change-Id: Ib2f644e3b6186efe34149ebc0904d571aac6bedc

Patchset: 4
https://gerrit.omnirom.org/#/c/5199/
Merge branch 'cm-11.0' of https://github.com/temasek/android_packages_apps_Settings into cm-11.0

Change-Id: If9b68764592d10aedb269729cb673e63d84448ea