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

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

Change-Id: If492731f4ecd18bceb2f4d700ab35ef9b628335e