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 am: 9d375380

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



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