conflict resolved
Correct active display settings naming

Change-Id: Ibfa2d41eed01d8987df52f013b111a0ce4e70739
Active display: Add options for date and am/pm [1/2]

Change-Id: Idc09772829cc6aa9bcfb064459fb3557c7b37f6b
Signed-off-by: ayysir <dresadd09691@gmail.com>
Carbon's ActiveDisplayView.java