am: efeb2cf9

Change-Id: I3e46e13d5e84a5e45849ca15d716486f1032bc4f

am: ac3c798a

Change-Id: I80a22e7fdb0272313c8d9f98b6360c6d235e37ac

am: 34eac2c5

Change-Id: I9ccc78cf03a37f80d3ba10408050a0b847bc2c7a

am: f1ef6ef7

Change-Id: Id4bcfa48e8cd32449c82e5b501357a6315329e11

am: 0d9c30cf

Change-Id: Ib8e91584604ab4abf46c53b35aa2b6be70a23f8a

am: 9487f80c

Change-Id: Iad2aad7163aea9b1b92ed3f46be7ce36cd0578c6

Merge "StringParceledListSlice throws exception when the IPC memory threshold is exceeded" into oc-mr1-dev
am: afe28cdf

Change-Id: Id6236ee2229b1a03fbddb5b408fb956f8e6ece09

Merge "StringParceledListSlice throws exception when the IPC memory threshold is exceeded" into oc-mr1-dev

* Add hasHumanReadableName() method to CachedBluetoothDevice that
  returns True when BluetoothDevice.getAliasName() is not null nor empty

Bug: 34685932
Test: pair Bluetooth device, send file over Bluetooth, unit tests
Change-Id: I197f3f7f3bcb7d785729473b25638006449ae862

am: cb065bc3

Change-Id: I089e0f69629666d21bc401c2191341a71d7c3172

am: 767ca113  -s ours

Change-Id: I6a46c18871f77a0f97c2498dc1595bd29e1e6575

Merge "Import translations. DO NOT MERGE am: b4f16b10  -s ours am: e7527d13  -s ours" into oc-mr1-dev-plus-aosp

am: e7527d13  -s ours

Change-Id: Id460576d6660c50202833d7eab6152c45213951a

am: 0309d32f  -s ours

Change-Id: I3982df3278279f1debb6b2e578393edbc37b356a

am: b4f16b10  -s ours

Change-Id: I458f0c75e3df2dccd9d622b4444c629ff7020f81

am: b4f16b10  -s ours

Change-Id: I0b3cf2e8204f78f342754b06988bd63344e72fa7

am: 64f6edc7  -s ours

Change-Id: I604ec95dec7466831a29526217308bb869326229

am: df2a8807

Change-Id: I3db23fef19fc66a4eee158fb3367f45078b30872

am: b09cf3fb

Change-Id: Icb4332b34bc8b940a2c30beab143f7136e0178de

* changes:
  Send add/removeDownstream info to offload HAL
  Don't completely stop offload if setting data limit fails.

am: 3a02835a

Change-Id: I628c81e32efecf733c6deb73f2877b00f66fa68c

am: f563cc5a

Change-Id: I2fb9fd06d77023c814d3dedc4ca4cc653ae4cd01

am: b1bd8409

Change-Id: Ibc7eed03b814ae725c9a86bca16be6c3f5c70141

* CachedBluetoothDevice's member mVisible does not mean whether the
  device is visible. Instead, based on its current usage in the library,
  it indicates whether the device was just discovered by SettingsLib.
* Rename the field to mJustDiscovered and associated setters and
  getters.
* This paves way for future addition of mVisible to indicate whether the
  device should be visible to user in the UI.

Bug: 34685932
Test: build only, no functional changes
Change-Id: I616904e6d5bb27dbae74f94819eb0e8607a16e20

am: c933ef6c

Change-Id: Ic39262b1f650695cc6903c3a9e2ddb592d47b365

am: d3d6ddea

Change-Id: I3bd2e7242a8100590311cca40369adf45b06e52f

Test: as follows
    - built
    - flashed
    - booted
    - "runtest frameworks-net" passed
Bug: 29337859
Bug: 32163131

Merged-In: I0cb81ac054fc2bf6c8b8bfe658e9404a15091d7a
Merged-In: I7abcdcc2d7d967179c47081a6db2b417164891f3
Change-Id: I6c59aa7cb80b54f376f294b24c1409710c553d74
(cherry picked from commit ed962a84)

Currently, if setting a data limit fails, we completely stop
offload in order to avoid data overages. However, the next thing
we do is try to fetch the stats and crash, because once offload
is stopped all our local state is cleared.

Fix this by fetching stats before we stop offload.

Bug: 29337859
Bug: 32163131
Bug: 64867836
Test: OffloadControllerTest passes
Test: no crash when disabling wifi tethering with BT tethering active
Merged-In: I7fc47e60b2da5f39c26fb22c1325618f9948dd38
Merged-In: I464dd2a6d1996b1cfb8bbf82b6ee453fd0747569
Change-Id: I260f5450f8b67f055983af68fb23a5f3cfc0bc69
(cherry picked from commit d743601a)

am: 29b1826f

Change-Id: If7fafa0922fdbc499c0c911a3f88ede9c8a26c1d