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

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

Change-Id: I10d42d3c1a27430b377c0363e91a7e37b246ef07