Bug: 193176503
This reverts commit 99ebd95ef1.
Reason for revert: Recent flakiness as mentioned in b/193176503.This cl was merged in build:7532561. Any test failures post this build shows exception linked to CameraMetadataNative.Reverting this cl to find and fix the issue.
Change-Id: If9fe3ce69f013b842a47745d976942aa71dfb8f6