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: 4ae75ea5 am: e88a99b9

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



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