Merge "[automerger skipped] Merge "Rename keylayout for SnakeByte iDroid:con to match by name" into sc-dev am: e4147d73 am: bb0ca9c6 -s ours" into sc-v2-dev-plus-aosp am: 8ee92988 -s ours

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

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

Change-Id: I8dc3c2364a36439c50868194c0051250bfab7220