This reverts commit 90d6fccf. Bug: 73953366 Test: Camera CTS Change-Id: I9092c10ebd3049d886210172cc8364067c439574