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

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

Change-Id: I908d16bb1bde664e9c435b57a4d88b49b2387b40