Merge "Revert^4 "servicestests and InputTests: allow warnings"" into main am:...

Merge "Revert^4 "servicestests and InputTests: allow warnings"" into main am: 931305e0 am: 6c5456d1

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



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