Merge "Revert^2 "servicestests and InputTests: allow warnings"" into main am: 5d977d2f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3500595



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