Merge "Move an initialization line to prevent merge conflicts from tm-qpr-dev"...

Merge "Move an initialization line to prevent merge conflicts from tm-qpr-dev" into udc-dev am: bf8ebf8e am: d9a56502

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



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