Merge "Merge "Fix: Cache key should include Layout type" into udc-dev am:...

Merge "Merge "Fix: Cache key should include Layout type" into udc-dev am: 9ae95fb7 am: 42836878 am: 3e892962" into udc-qpr-dev-plus-aosp am: cef00afd

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



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