Merge "Fixed the incorrect downlinkOffset and uplinkOffset values" am: bbdb25c72d am: 8faf3b51cf

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

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