Merge "Make PiP reentry state to use scale instead of size" into main

...c/com/android/wm/shell/common/pip/PipBoundsAlgorithm.java

...l/src/com/android/wm/shell/common/pip/PipBoundsState.java

...ell/src/com/android/wm/shell/pip/phone/PipController.java

.../src/com/android/wm/shell/pip/PipBoundsAlgorithmTest.java

...test/src/com/android/wm/shell/pip/PipBoundsStateTest.java

...src/com/android/wm/shell/pip/phone/PipControllerTest.java