Merge "Merge "Revert "Track current resized bounds for resized PIP."" into rvc-dev am: c8f8ec8ed4 am: 7edee9464e" into rvc-d1-dev-plus-aosp