Merge changes from topic "remove-auth-token" am: 6a8f891205 am: 6cdb257f37

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

Change-Id: Ibe3a036e2eecb5fa3183f4c9eee6be7c3124aac2