am ca12ea72: am cc503471: resolved conflicts for 619e79a2 to stage-aosp-master

* commit 'ca12ea7257079a9aaef14ee661550ba1d7130454':
  Enable signed-integer-overflow in wifi-display