Changing @ppbar to Appbar

Change-Id: I09ad9a925f717796281d277c7bc6464221d2614f
(cherry picked from commit e62994f3c8ab21e59ebdac44b2ed88d2430d69ba)
Appbar changes to compile and work with new CM "Display Settings: Better font size control

Change-Id: I2bd56a7cfa21a961cd6d1a942fc5d839a89f5489
(cherry picked from commit 8e34cfa8eed51ec1c877d0c4e7469be5d4fff75a)