[automerger skipped] Reorder RengineEngine and LayerSettings in VTS am:...

[automerger skipped] Reorder RengineEngine and LayerSettings in VTS am: 3a086419 am: 2ddea903 am: 0091d538 -s ours

am skip reason: Merged-In Iad39e1a4aa9a9488af54742df121a981756b6275 with SHA-1 92a3161e is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3461979



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