frameworks: Active Display support (1/2)

Conflicts:
core/java/android/provider/Settings.java