Reorder RengineEngine and LayerSettings in VTS am: 27c2a2da65 am: e4c853331e

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

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