Merge "Fix the host golden path asset dir config" into tm-qpr-dev am: 40d3988a

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



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