Merge "Fix NPE in TvPipController" into sc-dev am: 03b61d22b6 am: 6be2b2eff1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15156230 Change-Id: I30b4e828f7c4bd070f041fcaff077bfce00f76eb
This commit is contained in: