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

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

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



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