Merge "Set the correct size to the container of icon view" into tm-dev am:...

Merge "Set the correct size to the container of icon view" into tm-dev am: 6efe0b12 am: 86371a0a am: 7c92c9e5

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



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