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

Change-Id: I301de10f337dcc3f2825fc575b88a9da1dad39d2