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

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



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