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: 1c1f3946

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



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