Merge "Remove mTargetViewContainer safely" into sc-v2-dev am: 77f8728004

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

Change-Id: Ia4770263005a72491e98ed9043bce59f25b90e93