am a42634a5: am 76fd2e70: Merge branch \'klp-dev-plus-aosp\' of sso://googleplex-android.git.corp.google.com/a/platform/packages/apps/Launcher3 into klp-dev-plus-aosp

* commit 'a42634a571557f0826c519488a8c53c784abb952':