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

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