Merge "logd: cap out-of-order entry search" am: b15882faab
am: 1b559e2f8d

Change-Id: I759a08327d8e84cabf13fedc445308d91cbb834d