Merge "Remove unused hidden API UpdateLock"
am: f8e08d814d

Change-Id: I1354f2e2658b85fd1c32fa10ea60fad3344c9b12