am 0c126a84: am a099d1f6: Merge "Camera3: Always set a trigger ID for an...
am 0c126a84: am a099d1f6: Merge "Camera3: Always set a trigger ID for an active trigger" into klp-dev
* commit '0c126a84':
Camera3: Always set a trigger ID for an active trigger