Merge "Allow empty tokens in strict grammar" into rvc-dev am: 5fa6de7421

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I419d9acef8f843871677fd509682041c2dcef177