Merge "Add instrumented app to JAR path (isolated splits)" into qt-qpr1-dev am: d2317d0fac am: 9769b95c31 am: 08862bc2fc

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

Change-Id: I99f2ef8b1bce9da552dbee816055509b4e04a688