Merge "Basic javadoc for android.os.UpdateEngine." am: cbafc8d682
am: 91c1048bc7

Change-Id: I2130b49b61ee93ec79f1cd86f72fc98355bdc9cc