Revert "Revert "UPSTREAM: cros_gralloc: Avoid using masks in han..."

Revert submission 3309719-revert-3308804-MZCJYQCOVW

Reason for revert: initial cause of b/361574971 believed to be fixed with ag/29881064 and aosp/3309046 

Reverted changes: /q/submissionid:3309719-revert-3308804-MZCJYQCOVW

Change-Id: I60894baab0a773fdceb34601d8b05b54a6dd34f3
2 files changed