Pass assets directory am: bb4134ae2b am: 1d10a97584 am: bc8d37510a am: 5726292b5b am: 84b92ed3c3

Original change: https://android-review.googlesource.com/c/platform/system/apex/+/2052479

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