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 am: e41ec01a" into tm-qpr-dev-plus-aosp am: b2fec4ff

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



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