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

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



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