shinano: update bt config

Change-Id: I6fc0fcfe29c4da540509600a6bd3c6896d20b3d1
Revert "shinano: update bt config"

This reverts commit c2f397aeb3be402393fd21a012d60800ef8b6bc0.

Change-Id: I1a43dba049a7efba0804f0b642bf509e627ba258
Merge branch 'cm-11.0' into kk_mkt