[automerger skipped] Merge "Allow empty tokens in strict grammar" am:...

[automerger skipped] Merge "Allow empty tokens in strict grammar" am: bd03ae8b am: 618efc98 am: 61c321f4 am: e2995751 -s ours am: 7e05c392 -s ours

am skip reason: Change-Id Ie82dded77a3eaa75095333b0e77f10e21c9f7caf with SHA-1 a3986a5d is in history

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

Change-Id: I074b43a6cbebb63e8f7efe1d659f6d4ea4ea9554