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

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

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifcf761e62b7520ec9cf855deb41e45d3fa7ef078