Merge "Enable deprecated-enum-enum-conversion warning" am: 2c399905 am: 4fef0e21 am: 99977a6b

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2057428



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