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

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

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