Merge "Turn on clipboard image timeout flag in teamfood" into udc-dev am:...

Merge "Turn on clipboard image timeout flag in teamfood" into udc-dev am: 2d3fbc49 am: 23533cf7 am: 6d49ae09

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



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