Merge "Stop suppressing the ChangedDefault error" into main am: d69b5ff1 am:...

Merge "Stop suppressing the ChangedDefault error" into main am: d69b5ff1 am: ca3bfaba am: b079b4c2

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



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