Merge "Ensure face icon controller is deactivated when view is detached" into...

Merge "Ensure face icon controller is deactivated when view is detached" into sc-v2-dev am: 5f833103 am: d30c2ebf

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

Change-Id: I83955c34238147a9a2111d672c3bb407f311379e