Merge "Introduce UX Restrictions compliant ImageView" into pi-car-dev
am: ec20f69c54

Change-Id: I53de7d9e6ddf1fa8f59474e3aad212767ae050f6