Merge "Fix forward for LogLevel import" into udc-qpr-dev am: 2be74e83

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



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