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

[automerger skipped] Merge "Allow empty tokens in strict grammar" into rvc-qpr-dev am: b5954fba am: b6378525 -s ours

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

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

Change-Id: I09f8e5dabbe0077a74e783ebbebb26d883af216b