Merge "Allow empty tokens in strict grammar" am: bd03ae8b86 am: 618efc989b am: 61c321f4fb

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

Change-Id: If398a3b89bb6c11487d8ac2844bbf09cfb18b2b7