am bcb2839d: (-s ours) am 306c4688: am ca9eef62: b/12068020 Make kb layouts only unique to vendor/product. Do not merge

* commit 'bcb2839d576f1e91f0085d09c2b279d03053910f':
  b/12068020 Make kb layouts only unique to vendor/product. Do not merge