Merge 75280bdf ("setlocalversion: make indentation shallower") into android-mainline

Steps on the way to 6.3-rc1

Resolves merge conflicts in:
	scripts/setlocalversion

Change-Id: I7a4ea7e90da50e48b5e4a9545c0139545be79d2b
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>