Test: simulated build fingerprint change and checked logs
Bug: 62462279
Change-Id: I8446fcc9beed461a4554e79ab2b820839ced7c2f

am: 041111ff

Change-Id: I538f7faef85bbb13499dec2125e0f82b3175396f

am: 3756636a

Change-Id: Ic1e799c17b4bb0272cf85e03d5ad14981a55defa

Merge "Merge "Merge "Make TextInputTimePickerView use localized input" into oc-dr1-dev am: dd74c1a8" into oc-dr1-dev-plus-aosp am: d792c318"

Merge "Merge "Make TextInputTimePickerView use localized input" into oc-dr1-dev am: dd74c1a8" into oc-dr1-dev-plus-aosp
am: d792c318

Change-Id: I91e28ff9aa7b2bea64dcfe2371f8a734ea8cbb6e

am: a30cb89d  -s ours

Change-Id: Ie43a31dc8ccc156383c8ab24a255e0683a44622a

* changes:
  Add code to dump OffloadController state.
  Fetch tethering offload stats.
  Allow more than one source of tethering statistics.

Test: tested it with Tron logs to verify it works as expected.

Change-Id: I7b93fc57c1b72efbcb4f0dee429d7b22b47b6b0b

Merge "Merge "Make TextInputTimePickerView use localized input" into oc-dr1-dev am: dd74c1a8" into oc-dr1-dev-plus-aosp

am: dd74c1a8

Change-Id: I23c2927e8281cb00f4d0fef8c83bcdebb2f682c7

am: 164ff8a2

Change-Id: I08195e119f866acc9fe1795b892fe45cea3c7f47

am: a428392c

Change-Id: Ide67520d074330ec050ded71118bff0bc88be784

Merge "BootReceiver: Remove error log when last-header.txt is missing" into oc-dr1-dev am: d0b2c3b2
am: 0e015132

Change-Id: I0bfb235c4046623a5ae81cf8f2555ab408c0689c

am: d0b2c3b2

Change-Id: If06d96e09251c6de129c978f939f2206cbcda2d4

am: d9f8a6bd

Change-Id: I496e6162949d0e12093e09f690d19a10e7132351

am: f34b4633

Change-Id: Iaa872f5a6990f01dd832f48c88a3fc4625a89063

am: 15aef6c6

Change-Id: Icdaa9fd599a9d86657cebc97b468f08279bdccd0

am: 2098c83a

Change-Id: I4c46791379775c9fee08df41d38c9cfb0fa1775e

Convert CDMA CLIR MMI codes to 3GPP MMI codes when a CDMA
device is roaming on a 3GPP network. Use a Carrier Config
to control this feature.

Bug: 62933474
Test: Simulate Roaming scenario and ensure that the dial
      string is converted as expected.

Change-Id: If2b62b8148ba23840a4c018341e0fed24b41944b

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I61cfb2d4798350f28f1bb36aed67ee8f18895031

Previously, TextInputTimePickerView used the default numeric IME, which
could result in cases where the digits displayed in the text fields were
native, but the IME showed ASCII digits resulting in a mix.

Now we use setImeHintLocales to hint that we need a localized IME.

Change-Id: Ic4041dcc65a31bd00741c6d96d8cbc5dac9d77c8
Fixes: 63650251
Test: Manual (tested under en-US and ar-BH locales)

It's normal for /data/system/last-header.txt to not exist on
the first boot after factory reset. The code already handles
this case properly so the Slog.e is just noise that shows up
in bugreports.

Bug: 37513804
Test: manual - boot after factory reset, check logcat
Change-Id: I1c8e3437cdbda5e04c0299764c7e4921bef67cb3

Merge "Update the max height/width attribute of the TwoTargetPreference icon." into oc-dr1-dev am: 9f675cee
am: db0ec7d6

Change-Id: I7ef8fb885ee70d05b9afee829f8278f4236c9eb0

am: 9f675cee

Change-Id: I32b19e453af7a28c990a28b9726487415fe5be6f