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

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

Change-Id: I33a42de67660d9c7908a4fd4a042d7012002466e