[automerger skipped] Merge "lmkd: increase the soft limit for keyboard" am: 618be4c225 am: a213c8931c
am: 6db669c598  -s ours

Change-Id: I10d89f1f691787dd4d97e64ef03681edf203e359