Merge "Downgrade SuspiciousIndentation lint to a warning" am: d54eca3f6f am: 29343f2547 am: a6c1ab1f6e am: b8f167b786 am: 9a55e57e4a

Original change: https://android-review.googlesource.com/c/platform/external/nist-sip/+/2141008

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