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

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



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