Merge "Support persistent/transient asset variants in EDU tooltip." into tm-qpr-dev am: d98de99af8

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21232019

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