Merge \\"DO NOT MERGE: InputSettings: Fix incorrect keyboard list on rotation.\\" into nyc-mr1-dev am: 5af83786f7
am: 1fd447e778 -s ours
Change-Id: I53a2cf80a9eeb3a2049e706fd01501d2f6a263d8
This commit is contained in: