Merge "Fix enrollment preview surface leak" into sc-dev am: 2151a28c7c

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

Change-Id: Ia6c92a226d1fe7db3cf82c799145a7d773145352