Fixed stylus eraser being rejected by palm rejection

The stylus eraser appeared not to work, i.e. Android did not respond to
input from the eraser. It turned out that all input except stylus input
is rejected when palm rejection is activated. The problem was that the
eraser itself activates palm rejection when it hovers. The solution is
to allow the eraser during palm rejection. This solution makes sense
because the eraser input works in the exact same way as normal stylus
input.

Change-Id: I90824500be7613af4f00427c59ce828528b632f7
Merge "Fixed stylus eraser being rejected by palm rejection" into cm-10.2
BluetoothManagerService: fix enabling/disabling BT from Quictsettings under second user,

Change-Id: I8173559b2c734968ef4a8d86fddaa3a73d5c2b1e
(cherry picked from commit fe625c56d15eb091caddbf115ef90ebdf62490c0)
Merge remote-tracking branch 'upstream/cm-10.2' into cm-10.2