[automerger skipped] Merge "Rename keylayout for SnakeByte iDroid:con to match...

[automerger skipped] Merge "Rename keylayout for SnakeByte iDroid:con to match by name" into sc-dev am: e4147d73 -s ours am: cb4719f8 -s ours

am skip reason: Merged-In I9dd686ebcd612ca04d41b7b5cadf8442350346c9 with SHA-1 ce40a4d0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15120883

Change-Id: I52a531d249cb9a1ee49ad503208b72e5b8ca2948