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

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



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