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

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

Change-Id: I328f71c3c48b1b8d9b1efb89f33256c9b1dffe2a