Merge "Fix OfflineLicenseTest not provisioned" am: d023dfb808 am: 9d6c83f828 am: e70e686ea2

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2379529

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