Merge "Downgrade SuspiciousIndentation lint to a warning" am: 38dc415e0a am: 2c93c0f074 am: 871f1e1a15

Original change: https://android-review.googlesource.com/c/platform/external/emma/+/2141373

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