am aff24a52: Merge "Updated lockscreen camera assets Bug: 5296921" into ics-factoryrom

* commit 'aff24a52d20a26a8cd374ea6dd284eee16e4ffc0':
  Updated lockscreen camera assets Bug: 5296921