Merge "Make VCN HSUM compatible" into main am: c176987ebb

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2847205

Change-Id: I0f0df93859e6a3ae65218b4c3787fa072e68032c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>