am 306c4688: am ca9eef62: b/12068020 Make kb layouts only unique to vendor/product. Do not merge

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