Merge "Do not add quotes around flags argument" am: af4f8b9510 am: d82f6409a2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8975a707a1f1b768817504ff283feef346a05c7d