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

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



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