Merge "Merge "Fix parent check for isDeviceFinanced." into udc-dev am: be630d36 am: fa44fea4 am: 804efe8f" into udc-qpr-dev-plus-aosp am: 0ff8c802

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



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