Merge "Allow empty tokens in strict grammar" am: bd03ae8b86

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

Change-Id: I9cc83b4b9c121f633710486e849edd036f698ff7