tree 44c330a72bb469f5350115f726a3297fd4b33556
parent a96a1c42b73eb772c4a6a3ce15371bf2ea31b36f
parent 0603d70edd5aadcaae4ad6c75a694e49e7934f80
author Yan Yan <evitayan@google.com> 1733356735 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1733356735 +0000

Merge changes from topic "migrate-vcn" into main am: 0603d70edd

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

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