[automerger skipped] Merge "Remove unused hidden API UpdateLock" am: f8e08d814d am: 84fa2d7a66
am: 95c219e6bf -s ours
am skip reason: change_id Ib20219a47f27095bfce78a43aceeed2f5a9fda50 with SHA1 20452a32e3 is in history

Change-Id: I7f38dd0db3302f358139943c44f825bc92972ef4