Merge "Cleanup ENABLE_PIP_APP_ICON_OVERLAY" into udc-qpr-dev am: 3ca497b646

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

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