Merge "Fix app links verification resetting user state" into tm-dev am: 4ad09b9b am: 5b991bc5

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



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