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

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

Change-Id: I14a56aac54697a7196b4c91fe58d248a58c2a4b5