Merge "Address a couple small followups for TaskbarInsetsController" into...

Merge "Address a couple small followups for TaskbarInsetsController" into tm-dev am: 357c6225 am: 9de10ff8 am: 83929ce5 am: 1f1e63b2

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



Change-Id: I4ad66a7b853ad5439f639f65dda7cce0d965be32
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>