Merge "Fix init list order." into main am: b11daedf am: ac429b50 am:...

Merge "Fix init list order." into main am: b11daedf am: ac429b50 am: 9ed13f95 am: 21b183e9 am: f5050e96

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2645614



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