Change-Id: Idbfa585c85af496e7b66ac4b5771fadf56e9ebc6

Bug: 242648940
Merged-In: I926d520cec73ac54f4c9da75d9dcc67f2edc7db1
Change-Id: I23f68dddc6da5ad03958481e2ca50b6aabf8c593

Bug: 236760014
Merged-In: I926d520cec73ac54f4c9da75d9dcc67f2edc7db1
Change-Id: Icdd734a869f0c0a7fe8a000d2adec569cbd13f57

Merge "Snap for 8743232 from 83b16cee to gki13-boot-release" into gki13-boot-release

Change-Id: Ib4fae16b8667b698a67ffcfb8ad25b11a6ce5ea2

Merge "Snap for 8650941 from 10a2f468 to gki13-boot-release" into gki13-boot-release

Change-Id: Iae1dc8e0087ec4e93052bc2b64d616d12b9d6c05

am skip reason: Merged-In I926d520cec73ac54f4c9da75d9dcc67f2edc7db1 with SHA-1 f6d6787b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/sample/+/18582549



Change-Id: I3da4a093d026b4fd2a37c1c9f18845fe59bf2d28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

sdk.mk used to be a synonym for sdk_phone_armv7, but isn't anymore.
Update sample_addon to inherit directly from sdk_phone_armv7 instead.

Bug: 205008975
Test: presubmit
Merged-In: I926d520cec73ac54f4c9da75d9dcc67f2edc7db1
Change-Id: I926d520cec73ac54f4c9da75d9dcc67f2edc7db1

Original change: https://android-review.googlesource.com/c/device/sample/+/2101192



Change-Id: Ia7b9189392bb29ac7808f5e564afeb5831a95d82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/device/sample/+/2101192



Change-Id: I864157b9adb65a577ee9484d6191cba8cb9876a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

ccf28780

Change-Id: I500340227444e42cc3cbf5ccc2b7af3766e7794a

Original change: https://android-review.googlesource.com/c/device/sample/+/2100024



Change-Id: I2e24df4ab450d5b591d9ba28f6ee777dd74df20c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/device/sample/+/2100024



Change-Id: Idfb85f9c5492532bbe17477e739647d916171fb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Revert "Update sdk parent"

Revert "Slim down the sdk product"

Revert submission 2096601-sdkprod

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/build-details/8608272/targets/sdk, bug b/233036676
Reverted Changes:
I5ef671781:Update sdk parent
I940655c39:Slim down the sdk product
I926d520ce:Update sdk parent

Change-Id: I7bc644e81a1a4dbd69ea95f802989df06cdd8e08

Original change: https://android-review.googlesource.com/c/device/sample/+/2096343



Change-Id: Id9f1ff43eb812dd476e7a5c4e6270b14c93b78fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/device/sample/+/2096343



Change-Id: I3ddf3ed176e90688f3deed42e3b3110802f984a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

sdk.mk used to be a synonym for sdk_phone_armv7, but isn't anymore.
Update sample_addon to inherit directly from sdk_phone_armv7 instead.

Bug: 205008975
Test: presubmit
Change-Id: I926d520cec73ac54f4c9da75d9dcc67f2edc7db1

Merge "Snap for 8435113 from 69d69822 to gki13-boot-release" into gki13-boot-release

Change-Id: I436d5972b2ac385e45030279d6e2b225d2036a13

Original change: https://android-review.googlesource.com/c/device/sample/+/2041584

Change-Id: Ib6e51c8ca866590f4c4f0a7860c08fccab90c5ec

Original change: https://android-review.googlesource.com/c/device/sample/+/2041684

Change-Id: I75ada3da141c34e6e11583be1d3b1cbbb6570ff0

Original change: https://android-review.googlesource.com/c/device/sample/+/2041584

Change-Id: I8acf50fdecbc251eda27c0ed36c8962238060210

Original change: https://android-review.googlesource.com/c/device/sample/+/2041684

Change-Id: I9cb125c5a71afbd1a30e40d50a79aafa2591548d

Original change: https://android-review.googlesource.com/c/device/sample/+/2041584

Change-Id: I752dde3a466944a70d309d6f9f5ae59e9ec690ac

Original change: https://android-review.googlesource.com/c/device/sample/+/2041684

Change-Id: I726ad32b7ea3f7164fd2972385ebb48066f71b04

There are no attributes called mmsc_proxy or mmsc_proxy_port.
Replace with mmsproxy and mmsport.

Test: Manual
Bug: TBD
Change-Id: I9e95667c9b7ea5f32fab692bbf10ad85777dbc73

This mmsproxy was missed in aosp/2039583

Test: Manual
Bug: 190616902
Bug: 226193687
Change-Id: If13418673bf23b748680af374c3d5cc28e5e38bb

Merge "Snap for 8348513 from 79eabcac to gki13-boot-release" into gki13-boot-release

Merge "Fixing tracfone AT&T mmsproxy to remove http:// from value" am: 79eabcac am: 63f3080c am: dcb15963

Original change: https://android-review.googlesource.com/c/device/sample/+/2039583

Change-Id: Ibcc4d0809c0ad7bdde6efe48646b52214bb409d5

Change-Id: I8b8a17221f7d4cb1197b02ad8fc784ac5f365455

Original change: https://android-review.googlesource.com/c/device/sample/+/2039583

Change-Id: I4cece9838d39736643b2702bcc1d531555dafa25

Original change: https://android-review.googlesource.com/c/device/sample/+/2039583

Change-Id: Iaa4142927a4fde7c8fbfd39a4cbf57cee78d654c