tree 1978749f34abcdf880e0b381b62c90f52da8b1ca
parent 9d156bc0946afb725393e263aebf5bf1d1646d9d
parent 2a38feea995e66e723576d2c09c7ad246cd57ed8
author Jayant Chowdhary <jchowdhary@google.com> 1571850135 -0700
committer android-build-merger <android-build-merger@google.com> 1571850135 -0700

[automerger skipped] Merge changes from topic "hiddenCameraDeadlock" am: c52243f298 am: 8863a154f8 am: f7b975c56a
am: 2a38feea99 -s ours
am skip reason: change_id I4a697c1eaccc3603007be4a595febea981fbeb64 with SHA1 33e8ef86ec is in history

Change-Id: I5edc79740db0cfc2ebd06ce7ab3be6440096f57d