Revert "Revert^2 "Always have the current iconShape in BaseIconF..."

Revert submission 34209356-shadow-fix

Reason for revert: b/427517012
Bug: 427554036

Reverted changes: /q/submissionid:34209356-shadow-fix

Change-Id: I05c11432ec1705d2b9df5a8702319c3904ba8b24
1 file changed