[automerger skipped] Merge "Return copy of pending token list" into...

[automerger skipped] Merge "Return copy of pending token list" into rvc-qpr-dev am: 9dce0642 am: bd99a1dc -s ours

am skip reason: skip tag Change-Id I59d159d792a3d9e2a79ea521d6f01a5cb7c65695 with SHA-1 cbe48d94 is already in history

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

Change-Id: If6eb082433574015e5e61586beb79c657135a153