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

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



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