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

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

Change-Id: I5a8d2068b8aa535fdcc5ac53e735b5f3cf7d3fe5