Merge "Check for initialization of mUpdateEngine" am: e3a84af1a7 am: 0d39f92360 am: a545285129 am: 53f0434a3f

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

Change-Id: I6495a2790f9ebc5f1b0b64a5a061d03f49816111