Merge "Fixed the conflict of the release methods of ActivityView & TaskEmbedder" into rvc-dev am: 1c2e8eaf am: 095fe5e3 am: c55fd43c am: 0ef3a5b3

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

Change-Id: Iea93a6d13edc7ec1ac026bafd8dc621c9f535c79