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

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



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