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

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



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