Merge "Merge "Fix app links verification resetting user state" into tm-dev am:...

Merge "Merge "Fix app links verification resetting user state" into tm-dev am: 4ad09b9b am: 2793e6f3" into tm-d1-dev-plus-aosp am: 7b020c06 am: 1b7cf8f3

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



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