am a937b013: am 184b17dd: Merge "Camera2: Add a missing key for controlling shading map mode" into klp-dev

* commit 'a937b013f5ebe81562a0d298f9c990c975ba1dcf':
  Camera2: Add a missing key for controlling shading map mode