Merge "powermanager: Extend scope of lock when updating blocked UIDs" into mm6.0