Merge changes I69baed7b,I38a1da16 into sc-dev am: ce9134c982

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

Change-Id: Ie20dfd376ae72d241e01a66c473db678306dabd7