Merge "Add a flag that excludes a SurfaceControl from caching" into udc-dev am: 0bb4ed3d am: 767392ac

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



Change-Id: I64a599271b7b95f2c8db4587e9c48332040ac284
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>