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

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



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