am 455654cf: Merge "LayoutLib: Stub AM/PM keycodes in Time Picker." into lmp-dev
automerge: a0bc2e7  -s ours

* commit 'a0bc2e7e3c2f075a23449df00659c96d0cddb417':
  LayoutLib: Stub AM/PM keycodes in Time Picker.