Merge "Fix validation crash for nextPageToken." into sc-dev am: 17182c9519

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

Change-Id: Ia2b6bac986f304bf9b17e3539f6a201b2aeb19cc