[automerger skipped] Merge changes from topic "remove-auth-token" am: 6a8f891205 am: 6cdb257f37 am: 0aa923336e -s ours am: 01a1c9500c -s ours
am skip reason: Merged-In I35ce09412f47f2f2a17a371d518a0a518b70bfb6 with SHA-1 b1bcec9c7d is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2021760
Change-Id: Ic583027316bcea4d50bb8799537f6d74ce12cbdd
This commit is contained in: