Merge "Fix AppSearchShortcutInfoTest" into tm-dev am: 77ef5a4e45 am: becf8fa048
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18322991 Change-Id: I64b72aac75414adce4d47cfcdb6587069e08cd7a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: