Merge "liblog: sleep 20ms before critical property_set" am: 1d560ff24a am: 03ac8fe0be
am: 5d76be85a4

* commit '5d76be85a4f12af7e5118baebfff3b4e1711eb3d':
  liblog: sleep 20ms before critical property_set

Change-Id: I33b96980cab5f3dbf4f71976791d9c4337967ed6