* commit '3268a44e':
  Disable the header list of DebugSettingsActivity

* commit 'a5067333':
  Disable the header list of DebugSettingsActivity

This change addresses the issue that the debug settings on 10-inch
tablet doesn't show up.

Change-Id: I60540cf21276869a3ca81b7b0154056ce7d93ff1

* commit 'f33f1cab':
  [FileEncap9] Extract ResearchLogDirectory class

Previously used a monotonically increasing int.  Now uses uuid and nanoseconds.

squashed in:
    [FileEncap11] Read preference from ResearchSettings
    Change-Id: Ic779e0a69db6b16e92c6f4b63dbe7b7add566ab6

    [FileEncap12] Simplify directory cleanup invocation
    Change-Id: I688047409c0343d32b11447fb625dfb726c731ec

    [FileEncap14] Change log filename syntax
    Change-Id: I9243b20b2eb392f81ab8c5c3d19315211240e0bc

Change-Id: I5c9d70e0cb7b0965158e17dd71dfab796bd9a440

* commit '7faa2caa':
  [Lazy4] Remove useless debug code

* commit '95e09ea7':
  Import translations. DO NOT MERGE

am e563e585: (-s ours) am 620be98f: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit 'e563e585':
  Import translations. DO NOT MERGE

* commit '620be98f':
  Import translations. DO NOT MERGE

* commit 'fb606c62':
  Clean up StaticInnerHandlerWrapper a bit

* commit 'f0864b1d':
  Clean up StaticInnerHandlerWrapper a bit

* commit '1ab33383':
  Fix NPE found in monkey test

* commit '0d5f214a':
  Fix NPE found in monkey test

Change-Id: Ib07efe6da1eb2f0fd9ef68ca71502c98f7e19f4b

Bug: 8383127
Change-Id: Ifd70acabe118b477f103937c7f1e99e38e210833

* commit '3f46e8a8':
  Refactor skippable code point

am 68e9f78b: (-s ours) am 8067b769: (-s ours) Merge "[DO NOT MERGE] Deactivate H/W keyboard handling" into jb-mr2-dev

* commit '68e9f78b':
  [DO NOT MERGE] Deactivate H/W keyboard handling

* commit 'f5caf5be':
  Move checking non-persistent checkbox to onResume

* commit 'a38e14fd':
  Refactor skippable code point

* commit '8067b769':
  [DO NOT MERGE] Deactivate H/W keyboard handling

* commit '601a8582':
  Move checking non-persistent checkbox to onResume

* commit '0b251201':
  Make isInternal mutable

* commit '0ab44b21':
  Make isInternal mutable

* commit '64b95965':
  [Lazy2] Pass a runnable to abort

Change-Id: I5477b6e5d29d1f0b9c2fd5a495be77cf5f2fbaee

Change-Id: Ib81ceba801be0ac7ef65c4eadd1ec8599e80dacc

Bug: 8336068
Change-Id: I07e67a6aee24a239a21e6fc69eb2ec741b9a5b2b

Change-Id: I721afbf426099753aa876a55323eb806b08c24d6

* commit '5e75e15a':
  [Lazy1] Switch to blocking log closures