Change-Id: If39df19b99a3f45ebe82e89205d8bb0ff036e2a2
Change-Id: I26cac2fa347934e0740578b811aa5a6767cf4862
Change-Id: Ib13d5c77416e58161df0e04d7a15ec0dddbde8b5 Conflicts: core/java/android/bluetooth/BluetoothInputDevice.java Conflicts: core/java/com/android/internal/app/ShutdownThread.java services/java/com/android/server/SystemServer.java Conflicts: services/java/com/android/server/SystemServer.java services/java/com/android/server/pm/ShutdownThread.java