Merge "Revert "Deprecate getSfInstance usage in PiP component"" into tm-dev am: 654c80a2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17805905



Change-Id: Ief03f74867bf725a92b93ff3a67281c545e83f5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>