Reorder RengineEngine and LayerSettings in VTS am: 3a08641913 am: 2ddea90318 am: 14b0180f75

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

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