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

am skip reason: Merged-In Iad39e1a4aa9a9488af54742df121a981756b6275 with SHA-1 27c2a2da is already in history

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



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