Merge "Merge "Set the correct size to the container of icon view" into tm-dev am: 6efe0b12 am: 24263521" into tm-d1-dev-plus-aosp am: 5272a1f8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17887806



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