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

* commit '5381c1ad21e6e80f6819ba8ff9133bbdab6fead6':
  liblog: sleep 20ms before critical property_set

Change-Id: I3e000059a4e5bb6a7ffb6102db356b145a2c2717