Remove the navigation camera icon in keyguard if disabled by DPM

The logic here is incorrect: the camera shortcut is/should be accessible
even with a secure lock screen. As a result, a device with the lock
screen camera disabled by DPM and an insecure lock screen would still
display the unfunctional shortcut.

Change-Id: If1d172932c6c2af596c38e623521c992fdf95402

Conflicts:

	packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
p2p: Display P2P peer MAC address if device name is empty.

Display MAC address of a P2P peer in an invitation prompt
message on receiving invitation request from the P2P peer
with empty device name.

Change-Id: Icabeb91d666437746eb5a733ec582849eb7295a5
CRs-Fixed: 506109
SystemUI: fix battery text % dropping to 0

When the statusbar was recreated, the battery
text view was using the old reference and callback
(which didn't exist anymore). So just recreate the
text view with the statusbar.

Change-Id: I1f246a16d0a7d84054052372b68ec220eb4a7d27
Signed-off-by: Roman Birg <romanbirg@gmail.com>