Merge "Fix issue with last auth entry" into udc-dev am: e8cf1f7e

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



Change-Id: I6d5e28f4442361538ab8e2877624c94af8d7d3ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>