Add NinjaAndShellEscapeIncludingSpaces

Bug: 235333302
Bug: 240342946

Test: m droid dist

Change-Id: Ic52fbdb64042148d851403b4afd2dd5392282f77
Merged-in: Ic52fbdb64042148d851403b4afd2dd5392282f77
diff --git a/proptools/escape.go b/proptools/escape.go
index 4ef10f0..9443a95 100644
--- a/proptools/escape.go
+++ b/proptools/escape.go
@@ -122,4 +122,8 @@
 	return ShellEscape(NinjaEscape(s))
 }
 
+func NinjaAndShellEscapeIncludingSpaces(s string) string {
+	return ShellEscapeIncludingSpaces(NinjaEscape(s))
+}
+
 var singleQuoteReplacer = strings.NewReplacer(`'`, `'\''`)