Merge "Updating Eth Update Request to use Builder" am: 69785b16ec am: 15adc5f00c am: a61d31ecdc

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1991011

Change-Id: Idf1b3a44c21886540230cae43ec30035024a74c5