Merge "[SystemUI] Implement a way to put satin_dev.apk into test assets" into...

Merge "[SystemUI] Implement a way to put satin_dev.apk into test assets" into tm-dev am: 06f06e92 am: f0965de0 am: 0e591ed0 am: 35422e2b

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



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