Merge "Fix npe in FrameHandler" into tm-dev am: 76a99eccc0 am: ce0ada92a3

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

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