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
Show confirmation for deleted screenshot.

Change-Id: I4a36cf06bf252e5e15fe08fbd054dc64a0a507ae
Merge "p2p: Display P2P peer MAC address if device name is empty." into cm-11.0
Merge "Show confirmation for deleted screenshot." into cm-11.0
Update the color of the expandable volume panel icon

This still retains the old settings icon since it
happens to fit perfectly. Pressing it does indeed
show you a bunch of sliders like the icon indicates.

Also add xhdpi and xxhdpi versions.

Change-Id: I944a325c8871e1afc9d7163b0f23f7f9d8ae070a
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0
Merge branch 'cm-11.0' of git://github.com/AORP/android_frameworks_base into cm-11.0