Merge "Revert "remove unneeded dontwarn settings"" am: 7f6fc715 am: 1fce1d0d am: bd440959

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



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