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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icbde547c69af26710147c03b73437f5db5121f10