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: d118449c am: 1e496a56 am: 65fbf0ff

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



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