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

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



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