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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I481f17b14cac37be689af462843cc1576bbbebae