tree 67d4418891d6d5662cf080f0419a2d0149986862
parent f94b6d6d8118e27213e38c0449159c60cbd74362
parent fd39db81e44e191baa476a579de6cc2618de025a
author Jayant Chowdhary <jchowdhary@google.com> 1571694716 -0700
committer Jayant Chowdhary <jchowdhary@google.com> 1571701611 -0700

resolve merge conflicts of f7b975c56a98c3134adc5dc95834673eeee81f0d to qt-qpr1-dev-plus-aosp

Test: build
Test: Camera2 app take picture(sanity)

Merged-In: I4a697c1eaccc3603007be4a595febea981fbeb64
Change-Id: I8562c83478b1fe8fbda7c85f97b995985666918d
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>